Merge "MediaCodec: avoid touching output format at MediaCodec" am: de7ebba585 am: c426eeba4b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1694745

Change-Id: I242d7c0e0e6b7f95519a15ec67b9d140e5088479