Merge "Moved URI grants code out of ActivityManagerService to its own service (13/n)"