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

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

am skip reason: Merged-In Iea40b89733cc75a41f960fecb2ac24177a4cbd3d with SHA-1 69f6e76f is already in history

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



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