[automerger skipped] Merge "Merge history of cts/hostsidetests/statsd" into rvc-qpr-dev-plus-aosp am: 3baff55f8f -s ours

am skip reason: Change-Id I172e85e2246089839d2f29cb589999d636c01136 with SHA-1 42dfb590fd is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7e7780304be626a825a658fd0413d1ca7c07d11