Merge "AOD: Change DozeTriggersTest to run on prox-less devices" into oc-dev