[automerger skipped] Merge "MediaCodec: force synchronous release if setting...

[automerger skipped] Merge "MediaCodec: force synchronous release if setting release surface fails" into tm-dev am: db9911c9 -s ours am: 1584fdef -s ours am: 4d473214 -s ours am: 374e7bc8 -s ours

am skip reason: Merged-In I50ef86e42cf2049d2bdad9e60d509d2ce05356b9 with SHA-1 dd67a5ff is already in history

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



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