Merge "Revert "Hide keyguard earlier when exiting lockscreen"" into udc-dev am: 87e28c1f

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



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