DO NOT MERGE: Ambient light sensor changes for doze mode.
am: c4e1e4909d

Change-Id: I797db8f2a8607723582bb705bd667bd981d5f16f