Merge "Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev am: 153d2ff6 am: 444cd84c" into oc-mr1-dev-plus-aosp