Merge "Improve ID3V2.4 handling unsynchronization" am: 54babc4ae0 am: b7883d5194 am: 43e9672e81

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

Change-Id: Iba6d7a6fd2b692fd608732b1d9a1df477a1b4927