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

Merge "[conflict] Add onUdfpsUiEvent() and callbacks on overlay shown in FingerprintManager. am: fc343495" into udc-qpr-dev am: 287bbbc9

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



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