Merge "Use ActivityManagerService lock in grantUriPermission" into sc-dev