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

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



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