[automerger skipped] Merge "AudioFlinger: Remove unnecessary friends" into...

[automerger skipped] Merge "AudioFlinger: Remove unnecessary friends" into main am: b7ed4ae7 am: 370e62fa -s ours am: d016822b -s ours am: 63171b3e -s ours

am skip reason: Merged-In Ied525f2f100203800f746239685e77b8e033618e with SHA-1 ed0bd749 is already in history

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



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