[automerger skipped] Merge "Add a list of Biometric protected packages" into...

[automerger skipped] Merge "Add a list of Biometric protected packages" into udc-qpr-dev am: d3e27ee8 -s ours

am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 10e65bab is already in history

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



Change-Id: I6900c38133dc00378d27ec2f4c76866375c38337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>