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

[automerger skipped] Merge "Hide RSSI next to single carrier name" into sc-v2-dev am: 8a5c787b am: 1667dd36 -s ours

am skip reason: Merged-In I8b80bb14b8f60872d44d5a92ddfa7c5903420874 with SHA-1 64172cbc is already in history

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

Change-Id: I47e459103aaef17406f5decf7c42015a1776d8ea