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

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

am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 51c73e99 is already in history

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



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