[automerger skipped] Merge "[Settings] configuration for hidding SIM settings UI" am: 769d773997 am: 0a733a9ed9 am: 135392ec6d -s ours

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

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

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