[automerger skipped] Merge "Automatically dismiss SIM combination warnings and selection dialogs." am: f6089097 am: 65b7a184 am: 2055cdad -s ours

am skip reason: Change-Id Ia6e93d13009a773ede3bfcb02e82dbbfb4c437cc with SHA-1 bcaf327f is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1531143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id2f212835dc787dd4802982c41436874a217ead4