Merge "libstagefright: Increase retry count in Frame Decoder" am: 86108e35ae am: 844d903d19 am: 1ad57016b2

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

Change-Id: Ib1600fb27486fa0fcf8f24482de59ba3152061b5