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

am skip reason: Change-Id I15891d729232260cdc522b7871db28a7f34ecfd3 with SHA-1 36891a47e1 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/StatsD/+/1523301

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65d3c411e90265adee504585201a6388aff23972
tree: a1d098d41bac03e8ed92ef3578b9df4243ec97ee
  1. aidl/
  2. apex/
  3. bin/
  4. framework/
  5. lib/
  6. service/
  7. tests/