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

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

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