Merge "CCodecConfig: Add mapper for aac-profile" am: d930ab64fd am: b8ef07b433 am: 315c3460cf

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

Change-Id: I44e62a3aee55bdd997c2b3612d909bbe5035d2f3