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

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

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

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