Merge "DO NOT MERGE - Support native and srgb for night display" into oc-mr1-dev am: 2d110e6829
am: 10e9bc5ba7  -s ours

Change-Id: I31976f43ee46c37abc63d1680fea21e54329c785