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

[automerger skipped] Merge "Ensure ProxCheck doesn't unregister ProxSensor" into rvc-dev am: 6bb0f4c6 am: f8e63fb5 -s ours am: 317167d9 -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: I4462bc677aa74fd91e662906c4a3252016bf2c08