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

[automerger skipped] Merge "AudioFlinger: Add Track interfaces" into udc-qpr-dev-plus-aosp am: 4146fc44 -s ours

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

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



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