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

Change-Id: I72aaf6f03537cf9997ad46ecb3cf5dc1f2b483bf