Merge "Add javadocs to internal APIs for content URI permissions" into sc-dev