Merge "Make fsverity_manifest_generator deterministic" into main am: b6bbd67959

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

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