[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: 7a841c18 -s ours am: 7d91a15a -s ours am: 22c95b1e -s ours am: ab7c0f1f -s ours

am skip reason: contains skip directive

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



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