Merge "Merge "Add bug component for biometrics tests" am: 6daa1f6d am:...

Merge "Merge "Add bug component for biometrics tests" am: 6daa1f6d am: f1dd4b65 am: 8b55bec0" into udc-dev-plus-aosp am: 1a654d3c

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



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