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

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



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