Merge "Limit Display-P3 surface formats to 8888" into oc-mr1-dev
am: 8c6462c8c4

Change-Id: Ic33c2d48176835d272369af03ceaaf6c20e8f063