Merge "Add variable to aid errorprone update" into main am: 233adee5 am: 2067660f

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



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