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: 2d0b22a4

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



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