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

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

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