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

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

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



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