[automerger skipped] Check data consistency in mdls parsing am: e689e94f3b am: 0a3c762015 am: 2ecaa02926 am: 4a995822bc am: 80a0344555 am: b9ee07c0cb -s ours am: 6cfd74943d -s ours am: ac4265bcd1 -s ours am: 468d8e28d5 -s ours

am skip reason: Change-Id I6f3098b029b6da56415a588882a5bb908edd3db7 with SHA-1 e689e94f3b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sonivox/+/11961320

Change-Id: Ica6b2f14a1ba4929c14fec86c974ea20ded3c7e2