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

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



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