[automerger skipped] Merge "AudioFlinger: Update AudioFlinger class includes" into udc-qpr-dev-plus-aosp am: d89d56ff8a -s ours

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

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

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