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

Change-Id: Ic63ed0679d80732724da4b970f8497a2edcc966a