[automerger skipped] System-side vendor extension for handling vendor...

[automerger skipped] System-side vendor extension for handling vendor parameters am: e1253974 -s ours am: 2bfb2f62 -s ours

am skip reason: Merged-In I8e77238d85cfa91bd7b53e20ad42bd195160fb04 with SHA-1 e7a26adc is already in history

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



Change-Id: Ic6a965b67467e0409673098b5bfc8f51b629e266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>