Merge "Allowing content uris with cloneUserId to be accessed by parent user." into udc-dev