[automerger skipped] Merge "Add aconfig for biometrics flags" into main am:...

[automerger skipped] Merge "Add aconfig for biometrics flags" into main am: 9cb671cd am: bbbfcfa7 am: 7563b242 am: 187d02a3 am: 1ff74cb3 -s ours

am skip reason: Merged-In Idd66455b28cc61e53c68f559244ad2d022cf65d3 with SHA-1 4272c4c6 is already in history

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



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