Merge "[DO NOT MERGE] Support biometric re-enrollment for dangling" into 24D1-dev