tree 470910e65c7403277cd24d241e1ade88a65a2b4d
parent fbfcea771883792897afdabfa1534c5de0104ac0
parent 3e9a5b874c24fba8edb99495f8afa4a7d0e204de
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1608160070 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608160070 +0000

[automerger skipped] Merge "Automatically dismiss SIM combination warnings and selection dialogs." into rvc-qpr-dev am: 6403bb4cc2 -s ours am: 3e9a5b874c -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64f8fd3eda1be645bcbc56dd205e872eee0a4503