[automerger skipped] Merge "Support repacking super image with virtual AB" into rvc-dev am: d9869c2a42 am: d129e6ef07 -s ours am: 4edacdc03d -s ours am: 4bdde105c5 -s ours

am skip reason: Change-Id I03f33969d3c033a47cf123f94d875a4b56d2d343 with SHA-1 0071b427e4 is in history

Change-Id: I2b155b1c2ad2c498407d3609e22d0fefcc2ab18a