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

[automerger skipped] Merge "Add a list of Biometric protected packages" into tm-qpr-dev am: 36a20c19 -s ours am: 276d338b -s ours am: 2b0941ad -s ours

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

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



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