Merge "Add extra variables to soong.variables" into main am: b78b3340

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



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