[automerger skipped] Merge "RESTRICT AUTOMERGE Add a list of Biometric...

[automerger skipped] Merge "RESTRICT AUTOMERGE Add a list of Biometric protected packages" into tm-dev am: b5814ddc -s ours

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

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



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