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 am: 667eedce

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



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