[automerger skipped] Merge "Stop sharing ProximitySensor in Doze code." into rvc-dev am: a48f9637b7 am: 23b19caa90 -s ours am: 6fb2d9ec89 -s ours
am skip reason: Change-Id I0c5927f102237c57e9e50bc46ba7ebcb7fb79cec with SHA-1 0dbd617c24 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11958657
Change-Id: I890f9695cf706d6f6e2eec777856b6be1d8d1f60
This commit is contained in: