[automerger skipped] Merge "media: add media.codec flags" into...

[automerger skipped] Merge "media: add media.codec flags" into aosp-main-future am: 3f761a84 -s ours

am skip reason: Merged-In I8cd09b0c34d8e395a15eb6813a36aded4cc76ff3 with SHA-1 7079ffef is already in history

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



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