[automerger skipped] Merge "codec2: Add android fence implementation for...

[automerger skipped] Merge "codec2: Add android fence implementation for C2Fence" am: 2193cd32 am: 26aaa5e1 -s ours

am skip reason: Merged-In I14f66e6f4cf4ff3c878a3d8e78988c50d72c9a21 with SHA-1 92427a59 is already in history

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



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