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