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

Change-Id: Ia17370de250385171f6ff6b93eb3a59a4347f5a0