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

[automerger skipped] Merge "AudioFlinger: Add Track interfaces" into main am: f4794e87 am: ffe51ab2 -s ours am: d29bae6b -s ours am: fc243119 -s ours

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

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



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