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