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

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

Change-Id: I22aa5bbbbc1a3906a7b639a3a9a953af01ea5b06