[automerger skipped] Merge "Stop sharing ProximitySensor in Doze code." into...

[automerger skipped] Merge "Stop sharing ProximitySensor in Doze code." into rvc-dev am: a48f9637 am: 23b19caa -s ours am: 6fb2d9ec -s ours am: a9f791b9 -s ours

am skip reason: Change-Id I0c5927f102237c57e9e50bc46ba7ebcb7fb79cec with SHA-1 0dbd617c is in history

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

Change-Id: I5889fe697678ced15ea9fbe5aa816fca8a99d170