[automerger skipped] Merge "RESTRICT AUTOMERGE Add a list of Biometric protected packages" into tm-dev am: b5814ddca4 -s ours am: 7a841c185a -s ours am: 7d91a15a54 -s ours am: 22c95b1e2f -s ours am: a83d98a8c5 -s ours

am skip reason: contains skip directive

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

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