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

[automerger skipped] Merge "Revert "[Settings] configuration for hidding SIM settings UI"" am: 39d6e925 am: 48dc0133 am: f526772d -s ours

am skip reason: Merged-In If1df99a79e51125d03f534cdfc9408b01c61024f with SHA-1 5bcfa284 is already in history. Merged-In was found from reverted change.

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

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



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