[automerger skipped] Merge "Merge history of cts/hostsidetests/statsd" into stage-aosp-master am: d00f345029 am: 2f311dc20e -s ours

am skip reason: Change-Id If9619cb6ab2ae9c83cbfd0fcc1a6a19b9967c136 with SHA-1 965d590a95 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I798d2a889c9e8220c21a73f66530581c912380f9