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

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

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

Change-Id: I4ae688471378495393e677f4635197563f3722e5