[automerger skipped] Merge "test_display_p3: Use the colour library instead of ImageCms" into stage-aosp-udc-ts-dev am: b82e1bf83a -s ours am: f8a6fed933 -s ours am: c5df257a0b -s ours

am skip reason: Merged-In I783c4dd05e6d464568dc7649146ff37ae7b537c9 with SHA-1 dd8ea06dfe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24163723

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