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

Change-Id: I86ef53eec2bbeff07c52e079e925719c3923941c