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

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

Change-Id: I0549037723ae412316709a08f620801cc76f8c23