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

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

Change-Id: Id50fd992539b18c45ece71d8cd5d36c4a7c6093d