[automerger skipped] Merge "Hide RSSI next to single carrier name" into sc-dev...

[automerger skipped] Merge "Hide RSSI next to single carrier name" into sc-dev am: ef8407ab -s ours am: 97be759b -s ours

am skip reason: Merged-In I8b80bb14b8f60872d44d5a92ddfa7c5903420874 with SHA-1 66820d75 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315720

Change-Id: Ic92119925d3400fbf9023e2f655770981495c078