Merge "Revert "Revert "Hide keyguard earlier when exiting lockscreen""" into...

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

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



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