[automerger skipped] stop show preferred SIM card dialog during sim switch am:...

[automerger skipped] stop show preferred SIM card dialog during sim switch am: faf9baf9 am: 88619318 -s ours am: 82fb3dc1 -s ours am: 3af28e34 -s ours

am skip reason: Merged-In I242402e49b267c8cd61a85a46367c778d2d8bbf8 with SHA-1 c389149f is already in history

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



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