Merge "aacdec: fix error handling" into rvc-dev am: 50b8acd4e1 am: fb1290cb15 am: 290a16b146

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

Change-Id: Icbba40c06eead1b2a35347fc836a3a2b4716b4f0