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

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

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