Merge "Stop sharing ProximitySensor in Doze code." into rvc-dev