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

Change-Id: I720b212e16f6df6c5215ae529050b1b5a84a0900