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

Merge "Add extra variables to soong.variables" into main am: b78b3340 am: 2b24df30 am: 8e6660f7

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



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