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

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

Change-Id: I9428005510de23682a3b702681d89258264a1a69