Merge "Revert "FingerprintSensorProperties refactor - ui layer"" into udc-qpr-dev am: 410e1d09

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



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