[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: cdf6054f am: d11fb36b -s ours

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

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

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



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