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

Change-Id: Icffd015c285e10255c2404fb9eeefaa6c63b230c