[automerger skipped] Merge "graphics: COLORIMETRIC is optional for HDR modes" into pi-dev am: 739c3177ea
am: dcb3ba075f  -s ours

Change-Id: Ief59b8bc472e41eaa2e9a60d47ee4cb01e7f7347