[automerger skipped] Merge "[Settings] configuration for hidding SIM settings UI" am: 697f570fad
am: f7090ebbee
am: 011cdf6ef0
-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/+/2319109
Change-Id: I78cb592d8b30f349661cc0bf024165eb71c66e14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: