Merge "[BiometricsV2] Fix fingerprint add another fail" into udc-dev