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

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



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