[automerger skipped] Merge "Stay registered to proximity sensor while...

[automerger skipped] Merge "Stay registered to proximity sensor while activities are occluding keyguard" into 24D1-dev am: cf8362a5 -s ours

am skip reason: Merged-In I55f1472593d37f47574d4bf3c40ca7d69f86bad8 with SHA-1 9a29824c is already in history

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



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