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

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

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