[automerger skipped] Merge "Merge history of cts/hostsidetests/statsd" am: ec7f197f9c -s ours am: 1421643df9 -s ours

am skip reason: Change-Id I587aefd8ab26a052b428e0aceeb4195776f2535e with SHA-1 775dfac697 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I863ab1b5539c4006bdd78312fd65f2a85f131c1c