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

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



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