Merge "Add support for createContentUriForUser for Android R" into sc-mainline-prod