[automerger skipped] [DO NOT MERGE] Fix biometric test flaky am: 2f180de6...

[automerger skipped] [DO NOT MERGE] Fix biometric test flaky am: 2f180de6 am: eb2c908a am: bf306271 am: f3fd1891 -s ours

am skip reason: subject contains skip directive

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



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