Merge "fix potential encoding issues in remote actions" into main am: 39ccc637 am: 9a22984f

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



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