Merge "Merge "Hide keyguard earlier when exiting lockscreen" into udc-dev am:...

Merge "Merge "Hide keyguard earlier when exiting lockscreen" into udc-dev am: 049923ce" into udc-mainline-prod am: 731248d7

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



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