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

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

am skip reason: Merged-In If1df99a79e51125d03f534cdfc9408b01c61024f with SHA-1 5bcfa284 is already in history

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



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