Merge "Camera: Don't override extension surface native format" into sc-dev am: 4b68ed1f am: 08180f62 am: 6ca71255

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15456451

Change-Id: Idda05c468f1f50ccb71d85e67f437727cea34943