Merge "Hide keyguard earlier when exiting lockscreen" into udc-dev am: 049923ce

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



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