Merge "Update AccountManagerService checkKeyIntent." into main