Merge "Gracefully handle content uris without id in checkUriPermission" into mainline-prod