Merge "Support vendor color modes for sf mode sysprop" into qt-dev
am: abc726ec50

Change-Id: Ib53aeb70b45c6a56bfe8c16c8412a6e742d89492