[automerger skipped] Merge "[RenderEngine] Introduce non-linear display color...

[automerger skipped] Merge "[RenderEngine] Introduce non-linear display color transform." am: efca8f8c am: 80e4479b am: 653aac7a am: cc450d63 -s ours

am skip reason: Change-Id Ic731f014a14795b80323eeaf929761c828150f91 with SHA-1 436fc191 is in history

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

Change-Id: I2729cf39526037636de6b5eece0e301c9378bb3c