[automerger skipped] Merge "RESTRICT AUTOMERGE Add biometric authentication...

[automerger skipped] Merge "RESTRICT AUTOMERGE Add biometric authentication for package modification" into tm-dev am: f313de51 am: 1135fa48 -s ours am: ba7d8ce7 -s ours am: 4dd997ea -s ours am: 1369a4c0 -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30686223



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