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

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

Change-Id: I82b3459238c392d58c729d9d8ccb02341f85d23b