Merge "Merge "Support vendor color modes for sf mode sysprop" into qt-dev am: abc726ec50 am: aa1e335fa3" into qt-r1-dev-plus-aosp
am: 711cdfda5b

Change-Id: Idc47d3b7965828b42b831d5a82888bd33e9f173c