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