Merge "Revert "Allow default identity service to call keymint""