Merge "[Secretkeeper] Add maintenance methods" into main am: 1c6aa922 am:...

Merge "[Secretkeeper] Add maintenance methods" into main am: 1c6aa922 am: 63561520 am: 0cf1ef17

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



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