Merge "After keyguard exit animation, finish before notifying" into udc-dev am: c6be7237

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



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