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

am skip reason: Change-Id I0c5927f102237c57e9e50bc46ba7ebcb7fb79cec with SHA-1 52d801e4 is in history

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

Change-Id: I9c9a7d70340ed9444f9064cde502b71b2c659604