[automerger skipped] Merge changes from topic "aaudio-callback-close" into...

[automerger skipped] Merge changes from topic "aaudio-callback-close" into rvc-qpr-dev am: 27514853 am: 1281c1d4 -s ours

am skip reason: Change-Id I30fc7f00061a9caf5e3d9f7c8e257102c34f9d92 with SHA-1 4e8396f0 is in history

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

Change-Id: I44f4deec4d3104711576c8ff12aeb3aafbf242fd