[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

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



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