Merge "Merge "Use new, lower brightness value for low brightness doze." into oc-dr1-dev am: f5c3922645 am: 59965d6d7f" into oc-mr1-dev-plus-aosp
am: 693411c903

Change-Id: I1e22f79a440410b047e2aa4d8580642b643cbbd0