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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib341a6117e19268b89aef1bd02451aac050428b8