[automerger skipped] Merge "Ensure ProxCheck doesn't unregister ProxSensor"...

[automerger skipped] Merge "Ensure ProxCheck doesn't unregister ProxSensor" into rvc-dev am: 6bb0f4c6 -s ours am: e488996c -s ours

am skip reason: Change-Id I3c3faf79ba6d3915b0cfecec7861f6065ae689e8 with SHA-1 63027a63 is in history

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

Change-Id: I5545ca0b95232d7cab1714bec66d27cdf9fcf948