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

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

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