Merge "C2SoftAvcDec: Increase maximum output delay to 34" am: 8ae5b5d647 am: 45055ad490 am: 9f2312334a am: 153c389b76 am: b1c37d4969

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

Change-Id: Ieb201da99d4d8422b72a9429892c586ac7e83bf2