Merge "Reapply "Clean environment variables to account for sandbox work...

Merge "Reapply "Clean environment variables to account for sandbox work directory." with minor edits." into main am: c61d0a41 am: 406f9f85

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



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