Merge "Consolidate fs-verity wrapper in libfsverity_rs" am: 93302519d4 am: 6df71858ac am: 232cdde7e4 am: 1c70a17fb0

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2492595

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