[automerger skipped] Merge "libaudiohal@aidl: Change the criteria for patch...

[automerger skipped] Merge "libaudiohal@aidl: Change the criteria for patch matching" into main am: 5e742388 am: f56882c4 -s ours

am skip reason: Merged-In I71a32087afaef2a5b20e4fba514297c0052fa4c8 with SHA-1 1ef38268 is already in history

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



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