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

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

Change-Id: I2e38cde560b254300bf80022e68f204e8a5c7262