Merge "audio: fix aidl strategy name mapping error" into main