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

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

Change-Id: If9b1c1c251f59035ee7aff1c2f7cfada4e4f5fd3