Merge "Use RAII to ensure KeyMint keyblobs deleted" am: 462eccaa3b am: 15bc932a09 am: 8eac8ba511 am: 6a7f8f3320 am: 754636fc80

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

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