Merge "libaudiohal@aidl: Change the criteria for patch matching" into main am: 5e742388

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



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