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

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

Change-Id: Ie1209c1c75beedeedf53332b8817cb229500f2c7