[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 am: 528de880 -s ours am: f8b32d63 -s ours am: 8811176d -s ours

am skip reason: contains skip directive

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



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