[automerger skipped] [MEP] renew the sim confirm dialog UI am: ba9d2669 am:...

[automerger skipped] [MEP] renew the sim confirm dialog UI am: ba9d2669 am: 04424bbf am: 2eb57839 -s ours am: 1b62ca12 -s ours

am skip reason: Merged-In Icb00b3fc32066e21d22cbeca1fdf50e5d7dbef20 with SHA-1 4780be49 is already in history

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



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