[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

Change-Id: Ib1eb8e0ead0f640f2bdbdb6bf69ac1dab9418c40