Merge "fs_avb_test_util: adding logs for debugging" am: 61668cf10f am: ede5855be6 am: c802683926

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

Change-Id: Ia49dfe09a20a14ec171fb861cc618647008535ba