Merge "RESTRICT AUTOMERGE Fix detect biometric logic." into tm-qpr-dev am: b628a2bc

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



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