[automerger skipped] Improve ID3V2.4 handling unsynchronization am: a3b006c8...

[automerger skipped] Improve ID3V2.4 handling unsynchronization am: a3b006c8 -s ours am: c379bfd7 -s ours

am skip reason: Merged-In I2a307cbade2563f156c012a7b69a09bd66ef1eff with SHA-1 44c1ace9 is already in history

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

Change-Id: I8f045e1569547a6f13e12117a618d466bedf569f