[automerger skipped] Merge "Cherry pick the cl to aosp to unblock partner....

[automerger skipped] Merge "Cherry pick the cl to aosp to unblock partner. Check light sensor is null for biometric logging" into main am: 2ff3babf am: 47328bff -s ours

am skip reason: Merged-In I7604f1dd8b1314822b141e18b1c2d6fb717db4ae with SHA-1 54534f9c is already in history

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



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