[automerger skipped] Merge "[DO NOT MERGE] Fix biometric test flaky" into...

[automerger skipped] Merge "[DO NOT MERGE] Fix biometric test flaky" into udc-dev am: cf573812 am: b62aec17 am: 98fc1cb4 am: 1af87746 -s ours

am skip reason: subject contains skip directive

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



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