Merge "Handle content uris without id in checkUriPermission" into rvc-qpr-dev