Merge "[DO NOT MERGE] Fix biometric test flaky" into udc-dev am: cf57381227

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

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