Merge "[BiometricsV2] Fix 2nd touch not work for enroll" into udc-dev am: b29aa72f

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



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