[automerger skipped] Merge "libEGL: When driver doesn't understand P3, map sRGB-encoded P3 to sRGB" am: c032734399 am: 48320ee9d2
am: 4263c124af  -s ours

Change-Id: I566e2a6246d6dd1dfd6477dc40bc9f705135456e