Merge "Merge "Support vendor color modes for sf mode sysprop" into qt-dev am:...
Merge "Merge "Support vendor color modes for sf mode sysprop" into qt-dev am: abc726ec am: c2df9bdb" into qt-r1-dev-plus-aosp
am: a6185a06
Change-Id: Ic08977a5e7a009d9bc94363f6f06c23063c0cea3