Snap for 4739962 from cf91dcdee36775965938f5535480d6345821b459 to pi-release

Change-Id: I51d049324eb07de8fb391f9e21170e0c5a3b2f64
diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index c8a8f84..22524c9 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1405,7 +1405,6 @@
     if (!result->resultCode.isOk()) return Status::ok();
 
     std::vector<KeyParameter> inParams = params.getParameters();
-    appendConfirmationTokenIfNeeded(op.characteristics, &inParams);
 
     auto hidlCb = [&](ErrorCode ret, uint32_t inputConsumed,
                       const hidl_vec<KeyParameter>& outParams,