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: 525855ba

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

Change-Id: Icd6921c57eef70754c17b54c1b4d572b08da2c56