Merge "Ensure m4a files get the right metadata on scan" into mainline-prod am: ad9092820a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/13259382

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4351f530470b52e2e41c30f9bf1f12ffe94f30b