[automerger skipped] DO NOT MERGE: Fixing SRGB for devices that do not support SRGB color mode am: 2f3553e1ed
am: c055afc896 -s ours
am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history

Change-Id: I9fa08273e63339a91107b7dbbda975fbd98d664f