tree adedfe91b9613a75790bd783e3b2a8d64b5c3e5e
parent b76caaa8919ecfb43f6d6de4a44d199755c6648b
parent ce5dcc455a5dd4d7491a745ba1fe78168550fea3
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1608149575 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608149575 +0000

[automerger skipped] Merge "Automatically dismiss SIM combination warnings and selection dialogs." am: 19eb4c31be am: abf3f7167e am: ce5dcc455a -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9077c0d1507b1777d1005339ac87a49994c60624