[automerger skipped] Merge "Workaround patch for the issue of losing payload in the host tool." into android10-tests-dev am: 5ecad23d7e am: d4ef12c3cb -s ours am: f638eed0c1 -s ours am: 6f952a33bd -s ours am: 6104677fa1 -s ours am: c51b40c8e0 -s ours am: 3581381736 -s ours am: a1909ba689 -s ours am: fcd594234a -s ours

am skip reason: skipped by user dshi

Original change: https://android-review.googlesource.com/c/platform/test/vts/+/1607433

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