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

[automerger skipped] Merge "Stop sharing ProximitySensor in Doze code." into rvc-d1-dev am: f8745f10 am: 812b81c8 am: 4377bbd9 -s ours

am skip reason: Change-Id I0c5927f102237c57e9e50bc46ba7ebcb7fb79cec with SHA-1 2fb102a9 is in history

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

Change-Id: I58261e7a21d1ad39ee0d0cd88914721eb46eb2f8