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

Change-Id: I00e6483f9356238e57ad9b9992c41972411aec28