tree 61b19ba494a32fdbce9dd51d624d10e0fc9a1e91
parent d33b36e39898ce6f0d4d53418cedd5186b4db7b3
parent 3573e6e89b5802ba7eb856673456105ab9bd2b75
author Aaron Liu <aaronjli@google.com> 1682015240 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1682015240 +0000

[automerger skipped] Merge "Dismiss keyguard when simpin auth'd and..." into sc-dev am: 42c4052f45 am: ab63a519af am: 7c41d5df29 am: 1203dee205 am: 149751ff28 am: f12f638d19 am: edd97e8eb0 -s ours am: 3573e6e89b -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: I2200a1033be7e740c5958c4a72489a6a155e7447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>