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: d9ddeab7

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

Change-Id: I915dd816fbbd6bfcb590fbf77836bde44d87ca61