Merge "Fix expansion of _include_stack in _import-node" into main am: 7120481a am: e48e393a

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



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