[Secretkeeper] In-memory KeyValueStore am: 2759df0d3c am: 5c86cf8553

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

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