[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 am: 6cd77be7 -s ours

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

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



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