Merge "Cherry pick the cl to aosp to unblock partner. Check light sensor is...

Merge "Cherry pick the cl to aosp to unblock partner. Check light sensor is null for biometric logging" into main am: 2ff3babf

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



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