Merge "After keyguard exit animation, finish before notifying" into udc-dev...

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

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



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