[automerger skipped] Merge "Revert "Create a product variable for skipping...

[automerger skipped] Merge "Revert "Create a product variable for skipping apex contribution..."" into main am: 3e48d693 am: 620753f9 -s ours

am skip reason: Merged-In Ib2c018a2aeda5578cf3f1a6a56253bf84850ba5f with SHA-1 88b1d9b0 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/build/soong/+/2964564

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



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