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

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

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