Merge "Fix detect biometric logic." into udc-dev am: 53b62679

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



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