[automerger skipped] Merge "DO NOT MERGE MediaCodec: add methods to...

[automerger skipped] Merge "DO NOT MERGE MediaCodec: add methods to query/subscribe vendor parameters" am: 59035dd2 am: de806ecd am: 21cf15bf -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifa8d0321069dc04983d7cf8ab60d7ff9c7be3e73