Merge "AudioFlinger: Update Tracks class includes" into udc-dev-plus-aosp am: 590dd5e0fa

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

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