[automerger skipped] Merge "Add a method to reset circular references in audio...

[automerger skipped] Merge "Add a method to reset circular references in audio flinger service" into main am: 37e9203e -s ours am: 9d78e7c7 -s ours

am skip reason: Merged-In Ibc02685bfddfb01a4ff18c6c16d2e49702eb24ee with SHA-1 fd414a83 is already in history

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



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