[conflict] Add additional directories from which env config can be loaded am:...

[conflict] Add additional directories from which env config can be loaded am: ef073be1 am: cc5020c9 am: 8f012ef4 am: 749dacac am: 3b9f9fe1

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



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