Merge "ActiveUnlock dismisses keyguard on trigger from assistant" into...

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

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



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