DO NOT MERGE: Ambient light sensor changes for doze mode. am: c4e1e4909d
am: b7e6c16ac0  -s ours

Change-Id: I455df2c1ab65fa2ff4a6beb183ec449ba4774aab