Merge "Merge history of cts/hostsidetests/statsd" into stage-aosp-master am: d00f345029

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8be99f8884be935397df0df827920b5c87e52fe9