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

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

Change-Id: Id0f69b229be9fb61fef907677414eda40fe0c83f