Merge "[conflict] Add onUdfpsUiEvent() and callbacks on overlay shown in...

Merge "[conflict] Add onUdfpsUiEvent() and callbacks on overlay shown in FingerprintManager. am: fc343495 am: 88966e9b" into udc-qpr-dev-plus-aosp am: 8a9d82be

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



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