[automerger skipped] Further ID3 parsing work am: f29e14c6 -s ours am:...

[automerger skipped] Further ID3 parsing work am: f29e14c6 -s ours am: 000b771b -s ours am: cdf58522 -s ours

am skip reason: Merged-In I19d68b1ed45a890ca91772322262c3eed11c0ff2 with SHA-1 6626fd2f is already in history

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

Change-Id: I84b5676840a9b5fa80c682bddc59dc72f6b26506