Merge "Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am: b60eb1a854 am: d559cb8124" into nyc-mr2-dev-plus-aosp
am: c0177f8772  -s ours

Change-Id: I797513f3072baf1e77ea502f2b03c0de734eb232