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

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

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



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