Merge "Add more checkKeyIntent checks to AccountManagerService." into sc-dev