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

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



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