Merge "Don't require awakeKeyguard for activeUnlock" into tm-dev am: 6a69a2c844 am: 92b65722f8 am: 82652a01dd am: e1ec1bc129
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186409 Change-Id: Icd4ae646528e3135ac5a4045b28783282ea20cb8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: