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

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



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