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

Change-Id: Ic9b19be3cb2035b956d8ad6669b841a38c718ac4