Merge "Update night display intensity coefficients" into oc-mr1-dev
am: 0bb97d9e0b

Change-Id: I858cc44d6037c3b3c33007f71b0721a5663c0740