Merge "Add support to configure state of operator name in status bar [2/2]"...

Merge "Add support to configure state of operator name in status bar [2/2]" into main am: 7c598253

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3516771



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