Merge "Fix color shift between gles and skiagl without color management" into...

Merge "Fix color shift between gles and skiagl without color management" into sc-dev am: 4019c52f am: 8bc8dc78 am: 7666903e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15132881

Change-Id: I900cf76481c360b6a3d761d6699f81ffe09180ba