[automerger skipped] Merge "[SPA] Add biometric authentication for package...

[automerger skipped] Merge "[SPA] Add biometric authentication for package modification" into udc-qpr-dev am: 06151a58 -s ours

am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 32e388ad is already in history

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



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