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

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

Change-Id: I15e0e4e790ae6d79e36136e15b1421f629ee5c79