Merge "keystore: Fix double ownership of ConfirmationListener in test" am: 8945ea98e9

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2048044

Change-Id: I42a22c87f947ea47071770149f10c101cffd579e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>