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

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

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