Merge "DO NOT MERGE: Ambient light sensor changes for doze mode." into cw-f-dev
am: 0dcdae30cf

Change-Id: I4f1e3de590645892d84c099260ed950eb2f64e8c