Merge "Automatically dismiss SIM combination warnings and selection dialogs." am: 33657f8d44 am: 04d95b6e8e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd0289d605724fd55adc9a5f37c7555e150efa85