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

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



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