Merge "Re-do of FingerprintSensorProperties ui layer refactor" into udc-qpr-dev am: 97babbeb1f am: b86da41ebb

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

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