[automerger skipped] Merge "AudioPolicyManager: Fix memory leak" into main am:...

[automerger skipped] Merge "AudioPolicyManager: Fix memory leak" into main am: 79ff7cde am: d47e457b am: 72eda8a5 am: da9c476f am: fe668249 -s ours

am skip reason: Merged-In I7d0363b4a1b725bdfa4949b85eb1a78c8b3d8ace with SHA-1 5b9a611e is already in history

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



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