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 am: 55860d07

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



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