Merge "individually escape results of $(locations)" into main am: 96b6a499...

Merge "individually escape results of $(locations)" into main am: 96b6a499 am: 16236fe3 am: 6f7f5cae

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



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