[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 am: 949af334 -s ours am: 864d6b22 -s ours

am skip reason: Merged-In I8b80bb14b8f60872d44d5a92ddfa7c5903420874 with SHA-1 9d8c4f2d is already in history

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

Change-Id: I037eab7ad5382102f7232e0621f617a28f2c37f0