Merge "Don't double-apply display color transform" into tm-dev am: 7a559b5d...

Merge "Don't double-apply display color transform" into tm-dev am: 7a559b5d am: e088e1f8 am: dea5295a am: a2634219

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



Change-Id: Ia05ce202b9d959d9c0e96f83031e72d0a7f6ddf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>