Merge "SystemUI: Don't display 5G in carrier name when data type is not LTE" into q-keystone-qcom-dev