Merge "Make the AccountManagerService clear old grants when the package that the grants refer to is no longer installed."