Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev
am: bdaada0af9

Change-Id: I1b15ab6395b4935d1169246d42fa0a6f0c588a3d