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

Change-Id: I09803955b09d3dec66bca8e4fed6f21fe18aa7d6