Merge "Remove config_showOperatorNameInStatusBar" into tm-dev am: 883f14f0...

Merge "Remove config_showOperatorNameInStatusBar" into tm-dev am: 883f14f0 am: 952408ca am: 228c26e2

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



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