Merge "MediaCodec: minor revision of APIs for vendor parameters" am: 5d41bf1b65 am: 69814e45a1

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

Change-Id: Ic35494916ed8795a5809349f422482cb8aae00f3