Merge "aacdec: fix error handling" into rvc-dev am: 50b8acd4e1 am: 81f31f3938

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

Change-Id: Ia2bc9590f92c38bbe1da43319d3e67db4a55ed0b