Merge "Fix the problem of incremental OTA upgrade failure (recovery part)" into main am: 64e3bde459

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

Change-Id: I9f2cb75666ce9cf76fdeed3316c9b0c72590d320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>