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

[automerger skipped] Merge "Automatically dismiss SIM combination warnings and selection dialogs." am: 19eb4c31 am: abf3f716 am: ce5dcc45 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9077c0d1507b1777d1005339ac87a49994c60624