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

[conflict] Add onUdfpsUiEvent() and callbacks on overlay shown in FingerprintManager. am: fc343495 am: 88966e9b

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



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