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

Change-Id: Ife7e47b06d08967a210ae6db46bbaa015926302e