[automerger skipped] Merge "AudioFlinger: Update AudioFlinger class includes" into udc-dev-plus-aosp am: 714ffd65b3 am: e1a844f6c9 -s ours am: 080e80ac7a -s ours

am skip reason: Merged-In Idfa767f596ef6c6155664d06cbf177183cc08155 with SHA-1 9a557a26aa is already in history

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

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