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

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



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