Merge "Mitigate LSKF leaks in RecoverableKeyStoreManager" into main am: 4857d7011d am: a1077c5d47

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3057483

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