[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: 02e8d92a -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/+/11959493

Change-Id: I90767496f40852062ac96be1bcae692da90ca9a2