[automerger skipped] DO NOT MERGE: Fixing SRGB for devices that do not support...
[automerger skipped] DO NOT MERGE: Fixing SRGB for devices that do not support SRGB color mode am: 37d1599e
am: 2e6f7a6f -s ours
am skip reason: subject contains skip directive
Change-Id: I6936326895e09704576d8f3ff7827c307b6b3b00