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

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

Change-Id: Ieaee667c7f51389b5481f803d6d3e62fd1f72761