Merge "Revert "Revert "Hide keyguard earlier when exiting lockscreen""" into udc-dev am: 2c8b7416 am: 273df67e

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



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