[automerger skipped] Merge "Support repacking super image with virtual AB" into rvc-dev am: d9869c2a42 am: d129e6ef07 am: 96d4409f0d -s ours am: a09d7e66fd -s ours

am skip reason: Change-Id I03f33969d3c033a47cf123f94d875a4b56d2d343 with SHA-1 3e8b7f96d8 is in history

Change-Id: I9f9b6d9b3af0e7eb89195fcbd4bcd594c2e98e2f