[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: ff5d2909 -s ours am: 6971b817 -s ours am: bdbf97da -s ours

am skip reason: contains skip directive

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



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