Merge "Use RAII to ensure KeyMint keyblobs deleted" am: 462eccaa3b

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2617612

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