Merge "Support using ImageDecoder with ContentResolver + URI"