Merge "Add additional optional audio/x-mpeg MIME type to MIME type map" into rvc-dev am: ed44012906 am: 82d75b27d9 am: 1ae6c9f481

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

Change-Id: Ic62f07636e638fde4f6716f07458b2b57a0350ac