Merge "AAC decoder: fix KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT" into rvc-dev am: 7f21c552d2 am: d0a4a23297 am: b3f2ec5df5 am: fdaca3b25f

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

Change-Id: I9f74198014b5336eed144b2be62cc1cee8e80f8c