Merge "Remove need for onActivityResult from KeyChain API"