Merge "Add biometrics owners" am: ecea8deae9 am: b0db693fb2 am: 2d2124a26f am: 5914a15a52 am: 2fef428caa

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

Change-Id: Ibd5b373bb375b03e090695b8ecdb92c2b154facc