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: 44ed4a1f

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



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