Merge "stagefright: fix stop-error-error crash" am: 20438f8555 am: 9bb559857e am: 392ec7ae73

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc62c9303db52e75902eea2df4b0feeb6ef034d9