[automerger skipped] Merge "AudioFlinger: Add Track interfaces" into...

[automerger skipped] Merge "AudioFlinger: Add Track interfaces" into udc-dev-plus-aosp am: 4f7d1e70 am: 1e289b92 -s ours

am skip reason: Merged-In Iee8fd68fcd1c430da09b11d68a57fc62ba4c6f75 with SHA-1 fafbebc5 is already in history

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



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