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

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



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