Merge "Fix bug in ota_from_raw_img when generating multiple images" into main...

Merge "Fix bug in ota_from_raw_img when generating multiple images" into main am: 6b8d925c am: 93b32296

Original change: https://android-review.googlesource.com/c/platform/build/+/3148857



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