Merge "Merge "Support native and srgb for night display" into oc-dr1-dev am:...
Merge "Merge "Support native and srgb for night display" into oc-dr1-dev am: 37082aa5 -s ours" into oc-mr1-dev
am: 074ecca5 -s ours
Change-Id: I6ec817c51f26332cc0c903d932513aca93e3b823