Merge "fix potential encoding issues in remote actions" into main am:...

Merge "fix potential encoding issues in remote actions" into main am: 4e6c3ef5 am: 165ae98f am: 40c2cbde

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



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