Merge "Use new, lower brightness value for low brightness doze." into oc-dr1-dev