Merge "Convert bitmaps to sRGB/scRGB when they have a color profile" into oc-dev am: 33813bd439
am: 6869c55106

Change-Id: I69b4e1ba160032255891fbb2656445badd5b936e