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

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

Change-Id: I8da79b8894e46c08b6e6cdff1324b348caf95338