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

Change-Id: Ie94c829a3a4bf0dce6b3d5781eeed6341e51b114