Merge "Attempt to deflake CtsStatsdHostTestCases" am: e290a6f29b

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

Change-Id: Iaf8439c3ce9bb83b801067082773d8a5529b525b