[automerger skipped] Merge "Assume convenience for biometrics not configured in R" am: f064ef4e am: b4f69ae6 am: 26106731 am: 11e8c029 -s ours

am skip reason: Merged-In I2ae8b746bb5247b5bb6ef9929b3a11ad5403ca48 with SHA-1 7edbab64 is already in history

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

Change-Id: I5aaa10733f6bae3833e3921e99dc6d78d233074d