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

[automerger skipped] Merge "AudioFlinger: Remove unnecessary friends" into udc-dev-plus-aosp am: 3a071826 am: 56aaeaa9 -s ours

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

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



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