Merge "keystore: Fix double ownership of ConfirmationListener in test"