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

Change-Id: I537e98e43c61868d156439383ee21a06b3dc2b41