[automerger skipped] Merge "Merge history of cts/hostsidetests/statsd" into mainline-prod am: 378d5c2040 -s ours

am skip reason: Change-Id I18cb97920d88c7af3701f5f85a78d26b87996685 with SHA-1 614fcb33ce is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/13201758

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa23a0e6e9b82528607dc1234744d36ed1efb24f