Merge "Don't require awakeKeyguard for activeUnlock" into tm-dev am:...

Merge "Don't require awakeKeyguard for activeUnlock" into tm-dev am: 6a69a2c8 am: fe29e5e6 am: e2fcb7ed am: 39bfb6de

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



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