Merge "Add test utils script to xTS zips" am: e029e1e7 am: f3207430 am:...

Merge "Add test utils script to xTS zips" am: e029e1e7 am: f3207430 am: 35ff4ec9 am: 10738e13 am: 09dd9c9b am: c7e61b3b

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



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