Merge "C2SoftAacDec: Compute output port delay from stream info" am: ee90884a60 am: 98774ceff5

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

Change-Id: I4a4b0e9db8fafb03033e053b2bd0916bbfcfd9cd