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

Change-Id: I1fe823880b3fd958237173f80663f88c8690406c