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

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



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