Merge "ActiveUnlock dismisses keyguard on trigger from assistant" into tm-qpr-dev am: d41ebc8b

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



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