DO NOT MERGE - Merge ab/7272582 am: f60391005a

Original change: https://android-review.googlesource.com/c/platform/prebuilts/remoteexecution-client/+/1735931

Change-Id: I41efdebf5e418d005beba4da7be727dcc27226b9