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

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



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