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: I7fea607a6411a373c030483309ecf95a91503376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>