[automerger skipped] Merge "codec2 sfplugin: remove MediaCodec.h dependency"...

[automerger skipped] Merge "codec2 sfplugin: remove MediaCodec.h dependency" am: 04b50e2f am: 727204fe am: 0302f74f -s ours

am skip reason: Merged-In Id43e8b49e6626067a3f6ad249b8b1316bf1ae8dd with SHA-1 ac29e599 is already in history

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



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