Merge "Remove now-unused access of IActivityManager for Uri grants"