Merge "MediaCodec: fix crash when stop-error-death" am: 480b056dd1 am: ac8189c344 am: f3cf0751fc

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

Change-Id: I20f4fdb7abf40484779fac0cac8c4108c685c3e2