Merge "Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am: b60eb1a8 am: d559cb81" into nyc-mr2-dev-plus-aosp