[automerger skipped] [conflict] Add additional directories from which env...

[automerger skipped] [conflict] Add additional directories from which env config can be loaded am: ef073be1 am: cc5020c9 am: 8f012ef4 am: 749dacac am: 3b9f9fe1 am: 11529f7e -s ours

am skip reason: Merged-In I9af83687d4eaeee1ffb0f88a750cfeb7c6d2bafb with SHA-1 7b7dca43 is already in history

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



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