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

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



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