Merge "Improve exception handling for MediaStore#getOriginalMediaFormatFileDescriptor" into sc-dev