Merge "Use audio_bytes_per_frame now supporting compressed formats" into main am: 8760c09f30 am: ef68b8b219

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

Change-Id: I60c6fad4561a75198e9981d82dd6ac1781ec000f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>