Merge "AOD: Fix possible NPE in DozeSensors" into oc-dr1-dev