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

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

Change-Id: I6d429cf95cdaec8ead1607154efacc972177a03c