[automerger skipped] media: add media.codec flags am: a8b4e47e -s ours am: 69042142 -s ours

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

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



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