Merge "Revert "Create a product variable for skipping apex contribution...""...

Merge "Revert "Create a product variable for skipping apex contribution..."" into main am: 3e48d693

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



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