Merge "Fix color shift between gles and skiagl without color management" into sc-dev am: 4019c52f68

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

Change-Id: I3646a5d649a31cf7f27215b478477dfd003a33cb