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

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

Change-Id: I0b3858fc05cc14a5bf116edfc38c994d3e20274f