Merge "MediaCodec: force synchronous release if setting release surface fails"...

Merge "MediaCodec: force synchronous release if setting release surface fails" am: 8700acf8 am: 61e5a4cc am: 1d91bf76

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



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