[automerger skipped] Merge "RESTRICT AUTOMERGE Fix detect biometric logic." into tm-qpr-dev am: b628a2bc am: eefaa319 -s ours am: 7d3692d1 -s ours am: 4db5b746 -s ours

am skip reason: subject contains skip directive

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



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