Merge "Create a product variable for skipping apex contribution contents" into main am: 6d7a094d

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



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