Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566

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



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