Merge "DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am: 789954fb69  -s ours am: 1cd816eeac  -s ours am: c994b07e98 am: 21c7490f20 am: 29af0f0b45"