Merge "Add test API for extra APKs" into main am: 7a7b2a9dd7 am: a16d3c18dc

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2950432

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