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

[automerger skipped] Merge "AudioFlinger: Remove unnecessary friends" into udc-qpr-dev-plus-aosp am: 8db5fd97 -s ours

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

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



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