Merge "Camera: Update surface sharing format restrictions" into pi-dev
am: a749cd584e

Change-Id: I501835fdbc828564c0a06157c970853ed142896a