[automerger skipped] Merge "[Settings] configuration for hidding SIM related UI" am: d40fd7c597
-s ours am: 5104a1bee0
-s ours am: 6242806577
-s ours
am skip reason: Merged-In I45b7898da440c36045aec64a0a86fb804116cd9d with SHA-1 ed95f35423
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299464
Change-Id: Ie63f2f0662a777f17041cbdac733f2c87e271931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: