[automerger skipped] Merge "[Settings][Back port] configuration for hidding...

[automerger skipped] Merge "[Settings][Back port] configuration for hidding SIM provider UI" into tm-qpr-dev-plus-aosp am: a81f71ae -s ours

am skip reason: Merged-In I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b with SHA-1 2f07595e is already in history

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



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