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

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



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