Merge "Add additional biometric OWNERs" am: 9674d6d6d6 am: 1176cad7f2

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

Change-Id: Ie6d4938961f7725cc141dd1a43f69a906b913f24