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

[automerger skipped] Merge "Create a product variable for skipping apex contribution contents" into main am: 6d7a094d am: d1aa8af7 -s ours

am skip reason: Merged-In I5330b44caf15193a00f1e255cef24b67c794382b with SHA-1 fb3ce333 is already in history

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



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