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

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

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