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

am skip reason: Change-Id I8312ddeb83d513a8d5f07dd51cd7990cdc88d38b with SHA-1 057246e8b5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18dde7fe200f6db01006a6cfcc5d6f91601cfb95
tree: 62bd30ca1756c11d3aa1bc31d35a4d5dcd98dc4f
  1. apex/
  2. bin/
  3. lib/
  4. tests/