[automerger skipped] Merge "audioflinger: fix missing track metadata" am:...

[automerger skipped] Merge "audioflinger: fix missing track metadata" am: 0b9a05aa am: eb241886 am: b6aa6fec am: a6f3580e -s ours

am skip reason: Merged-In I53c8ad41c1ce7266beff0362f576d2d07dd61ad5 with SHA-1 c5598738 is already in history

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

Change-Id: I6a0b227dea1a0a9b3e883d7f02a87d2612c64433