Merge "Add additional optional audio/x-mpeg MIME type to MIME type map" into rvc-dev am: ed44012906 am: 766a8501b5 am: 0a2e94c1b4

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

Change-Id: I45d7b220c37ed8f47dde48c20637805fa04a573d