Merge "Hide keyguard earlier when exiting lockscreen" into udc-dev am: 049923ceca am: 4299e685f6 am: f26a9c03c2

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

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