[automerger skipped] Merge "[Settings] configuration for hidding SIM related...

[automerger skipped] Merge "[Settings] configuration for hidding SIM related UI" am: d40fd7c5 -s ours

am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f354 is already in history

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



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