Merge "Merge "Override MIME type to match MediaStore behavior." into rvc-dev...

Merge "Merge "Override MIME type to match MediaStore behavior." into rvc-dev am: 38a6333f am: 1939ad73 am: eac11fa9" into rvc-qpr-dev-plus-aosp am: 56fa460b

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

Change-Id: I223a183847f90d1df3289fd3631cd7ecc8a8c521