Merge "Fix non-ab fuse ota fail bug" am: 13907aef6b am: 3024caac9a am: 7c3d40f7c7 am: 1f8cb01c69 am: 52135ba155

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1933118

Change-Id: I8477bfa5b94df81a421dc214cc4daa35fc86df0e