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

Change-Id: I7ce204de73542f590f9f2cf8441ef8010315cbed