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

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

am skip reason: Merged-In I8d7ddd18861a696830da39f040dfb14b9ed46726 with SHA-1 5dae2420 is already in history

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



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