Merge "aacdec: fix error handling" into rvc-dev am: 50b8acd4e1 am: fb1290cb15 am: 01de790c4f

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

Change-Id: I11589212f14fc3375f53d724806bf41b7ffaad93