Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am: b60eb1a854 am: d559cb8124
am: 3382eed560  -s ours

Change-Id: Ia0711babeba3b0c6b47b6a2166202bb345fe114b