[automerger skipped] Merge "AudioFlinger: Update Tracks class includes" into udc-dev-plus-aosp am: 590dd5e0fa am: 4cef6f3640 -s ours

am skip reason: Merged-In Ie887572d9b2545bff9f15f38fd9b29d78e6e3f74 with SHA-1 472f127c2d is already in history

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

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