Merge "Support native and srgb for night display" into oc-dr1-dev
am: 37082aa53e  -s ours

Change-Id: I6a7d3864db78ac95a175cc9097a821daa6ea6658