Merge "add override_apex to version_variant test" into main am: abe5e13b am:...

Merge "add override_apex to version_variant test" into main am: abe5e13b am: d516e7ff am: 3b2cb381 am: 8cf07193

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



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