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

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

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



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