Merge "Propagate exception thrown by ContentProvider.getType" into rvc-dev