Merge "audioflinger: fix missing track metadata" am: 0b9a05aadf am: eb24188605

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

Change-Id: I3d9654dd19802ec759d3d6dc534f9463057822e4