Merge "Don't require awakeKeyguard for activeUnlock" into tm-dev am: 6a69a2c844 am: 92b65722f8

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

Change-Id: Iee029086c171f7540764a648d531f3e1684b4fbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Beverly Tai
2022-05-12 18:03:47 +00:00
committed by Automerger Merge Worker

Diff Content Not Available