[automerger skipped] RESTRICT AUTOMERGE Fix detect biometric logic. am:...

[automerger skipped] RESTRICT AUTOMERGE Fix detect biometric logic. am: 5cfa9271 am: 4d6586a5 -s ours am: 8d6a625d -s ours

am skip reason: subject contains skip directive

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



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