Merge "fix the CWE problem in Biometrics." into main am: eb541f11cc am: 20705c6e24

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

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