[automerger skipped] Merge "libaudiohal@aidl: Fix handling of transient patch...

[automerger skipped] Merge "libaudiohal@aidl: Fix handling of transient patch updates" into main am: 5907ef33 am: 6d79edf2 -s ours

am skip reason: Merged-In Ic2ed15343f494f346de70af0f6d22fd59a3a81d7 with SHA-1 0be9192f is already in history

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



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