[automerger skipped] Merge "[Settings] configuration for hidding SIM remove UI" am: 889c81f77a
am: 68a039754a
am: e71a029160
-s ours
am skip reason: Merged-In Iea40b89733cc75a41f960fecb2ac24177a4cbd3d with SHA-1 69f6e76f2c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299467
Change-Id: I82cc3bccadb68aece589a3efde3f4f434c07f35d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: