Merge "stagefright: fix stop-error-error crash" am: 20438f8555

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I641ea3b3ddbd64868ea8d82d5a475e9cb17a06b3