[automerger skipped] Merge "libaudiohal@aidl: Fix callbacks handling" into...

[automerger skipped] Merge "libaudiohal@aidl: Fix callbacks handling" into main am: be3b7555 am: 0a982f03 -s ours

am skip reason: Merged-In I953cfc8862aa466d17f7992df052b7b68fb97e0a with SHA-1 8065bfd2 is already in history

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



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