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

[automerger skipped] Merge "Add biometric authentication for package modification" into tm-qpr-dev am: f459d407 -s ours am: 1182123e -s ours am: 31ec8316 -s ours

am skip reason: Merged-In I0c494e307b02229d751de118abcc89e4e61a6861 with SHA-1 27315b3b is already in history

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



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