[automerger skipped] Merge "[DO NOT MERGE] Support biometric re-enrollment for...

[automerger skipped] Merge "[DO NOT MERGE] Support biometric re-enrollment for dangling" into 24D1-dev am: 30b0a909 -s ours

am skip reason: Merged-In Ic2401ae588ae5e2d404dd67d7de67491548fdfa2 with SHA-1 4e636370 is already in history

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



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