Merge "Include android_soong_config_vars.mk in the make (kati) step." am: 36c1435e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc7f272e273f54df843650e7e74fcad40a76994a