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 am: e705c732

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



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