Merge changes from topic "fsverity_digest" am: 866d824328

Original change: https://android-review.googlesource.com/c/platform/build/+/1855993

Change-Id: I971194b0a6372e6c913a015bcaffef22a9adc317