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

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

Change-Id: Iae08d2b37cf9aea628f5f5d7ad5fe4a4460ad007