Merge "Register the single fingerprint sensor only if" into udc-qpr-dev am: 04922bdd

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



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