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

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

Change-Id: I50195daaa60b481b93b8c42e4c9af9d39f14030c