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

[automerger skipped] Merge "Automatically dismiss SIM combination warnings and selection dialogs." am: 33657f8d am: 04d95b6e am: 48bd757f -s ours

am skip reason: Change-Id Iaf30062f555ec2c119c4aafd6aa013e73b5253f0 with SHA-1 3ad8509b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I405cbdeec98bd72eb8c5a88b639d30e109ae5d48