Merge "Add carrier config support to operator name in statusbar" into tm-dev...

Merge "Add carrier config support to operator name in statusbar" into tm-dev am: 32e1fa35 am: 975868b4

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



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