Merge "Enable presubmit biometrics unit tests" into udc-dev am: 116f5c7d am: e4510d3b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23151357



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