[automerger skipped] Put base APK when AppSet is included in APEX am: e7cc3513 -s ours

am skip reason: Merged-In I1010ec66d8551fcc1e2d9119be7ecdba22186607 with SHA-1 4169a25f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22727406



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