Merge "Add biometrics owners" am: ecea8deae9 am: b0db693fb2

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

Change-Id: Icc5f94c45eb6ff9f805087fca545c2f793c73bce