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

Merge "[automerger skipped] Merge "Ensure ProxCheck doesn't unregister ProxSensor" into rvc-dev am: 6bb0f4c6 -s ours am: e488996c -s ours" into rvc-d1-dev-plus-aosp am: 4c4c29d8 -s ours am: 06761cba -s ours

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

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

Change-Id: I602e93871cc1dd1be64de57b416aebfe978c0e19