[automerger skipped] [DO NOT MERGE] Support biometric re-enrollment for dangling am: 5b515d8bff -s ours

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

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

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