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

Merge "Revert "Revert "Create a product variable for skipping apex cont..."" into main am: 9001b9af

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



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