[automerger skipped] Stay registered to proximity sensor while activities are...

[automerger skipped] Stay registered to proximity sensor while activities are occluding keyguard am: f380fff3 -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: Iad1b3db37470b72f56af74c2dab4df2d87680ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>