Merge "Make the KeyChain handled its own grants rather than having AccountManagerService handle them."