[automerger skipped] Merge "Merge "Add bug component for biometrics tests" am:...

[automerger skipped] Merge "Merge "Add bug component for biometrics tests" am: 6daa1f6d am: f1dd4b65 am: 8b55bec0" into udc-dev-plus-aosp am: 1a654d3c am: 864c0068 -s ours

am skip reason: Merged-In Id4869eeb232999cc86b72d0533ecdd2f4ea8cbe4 with SHA-1 3be4c0ab is already in history

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



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