Merge "Merge "Merge "Support native and srgb for night display" into...
Merge "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" into oc-mr1-dev-plus-aosp
am: a109ca0c -s ours
Change-Id: I4fcaed98730e1c0c448aa72315fa32685eaeaccd