Merge "fs_avb_test_util: adding logs for debugging" am: 61668cf1 am:...

Merge "fs_avb_test_util: adding logs for debugging" am: 61668cf1 am: ede5855b am: c8026839 am: a46bae0a

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1699467

Change-Id: I4a9aacc467dbbe504f5bf2f8d3aafb30e553c917