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

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

Change-Id: I0dca60c78e9d7785dcd0fe286f44476c6bd3d6a7