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

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

Change-Id: I1fd10eb131d3ae69e4328fcec32c0103260db45a