[automerger skipped] Merge changes from topic "upstream-audio-aidl-hal" am:...

[automerger skipped] Merge changes from topic "upstream-audio-aidl-hal" am: 2468ff56 am: 933e626c am: 06bd2b0c am: 6881a2e9 am: eb469837 -s ours

am skip reason: Merged-In I269d61c8c441b3db0832f5450f5e5a84a5989a99 with SHA-1 446519a3 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2190590



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