[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "libEGL: When driver doesn't understand P3, map sRGB-encoded P3 to sRGB"" am: df6c0adfa7  -s ours am: 8a87ddb578  -s ours
am: 76b6c62c80  -s ours

Change-Id: Ida073911011004afd12a72705650974bf7c01e43