tree d1b8a7112820e711f3d82a902949ea88afde7eca
parent 3b161563c9dd8e02d6fb02d16b44c394665432bc
parent 3cbed78a660d0107a74fe8ab4766181cbe6c45d6
author Aaron Liu <aaronjli@google.com> 1682015048 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1682015048 +0000

[automerger skipped] Merge "Dismiss keyguard when simpin auth'd and..." into sc-dev am: 42c4052f45 am: ab63a519af am: 7c41d5df29 am: 1203dee205 am: 26f89ddcd8 -s ours am: 3cbed78a66 -s ours

am skip reason: Merged-In Ib2d5400e930fa4d6f7f98e46f32a290ba5f558f4 with SHA-1 48fa9bef34 is already in history

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

Change-Id: Ia9f84f87e05723f027a45b5895a537923fa7d5a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>