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

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

Change-Id: I306c0afff438fea704153364b3b8e4fff94b89e4