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