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

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



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