Merge "Include extra_soong_config_vars.mk to add extra soong config...

Merge "Include extra_soong_config_vars.mk to add extra soong config variables." into main am: d76caefd am: 1aa29d06

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



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