Merge "Avoid NPE when fetching ContentProviderRecord#name."