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

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

Change-Id: Ie2785de6d9fab912e117bdf5cae2a85b918e8f5e