[automerger skipped] Merge "Automatically dismiss SIM combination warnings and...

[automerger skipped] Merge "Automatically dismiss SIM combination warnings and selection dialogs." into rvc-qpr-dev am: 6403bb4c -s ours

am skip reason: Change-Id I79468016814d23f2b77d5cf1e559b9a58e2949ab with SHA-1 3394708a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13230889

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08350e0ed8e72ade35ad37e3536e45913871ad1e