Merge "Mix good histograms in test data" into main am: c417b4bdce am: 409d1e9525

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

Change-Id: I20092249067fa192a73d58268a78f3a4b8f174a4
Signed-off-by: Automerger Merge Worker <[email protected]>