Fix S to T incremental OTA with XOR disabled am: 67144e53a0 am: 0db43b5ded am: e9fb2ae3e1

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2521157

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