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 am: 200c9588

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



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