[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: 3e9a5b87 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64f8fd3eda1be645bcbc56dd205e872eee0a4503