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

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

am skip reason: subject contains skip directive

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



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