Merge "[Status Bar] Fix carrier and userSwitchName text style flaw" into main am: 5ee2adb1ba am: 790e281f31

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

Change-Id: Id668f50350f49127f7b15b16f248f78b9097c508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>