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: e859fefc

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



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