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 am: cfc7f36e

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



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