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

[automerger skipped] Merge "Stop sharing ProximitySensor in Doze code." into rvc-dev am: a48f9637 -s ours am: 101a86f3 -s ours am: 871ead3d -s ours am: 5c5f102d -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: I9c3d157136ce466cd70c2827e7519750e14e50f5