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 am: 318caf62

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

Change-Id: I53bb145b056200899eec6bd48710834a20475347