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

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



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