Merge "[BiometricsV2] Fix fingerprint add another fail" into udc-dev am: d2122579 am: 63b579aa

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



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