Merge "Automatically dismiss SIM combination warnings and selection dialogs." am: 19eb4c31be am: abf3f7167e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82401854bf8a92f44510344cceb259db0608f33c