Merge "Fixing statsd_test flaky partial bucket e2e test" am: c22dbbf8d3 am: 3fcab61937 am: 517bb4e3e3

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

Change-Id: I44c69d7a462499cd153301e04d5f79adcd4e886b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>