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

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



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