Merge "Add tests for KllMetricProducer" am: 3071b4a92f am: 903bf1cda5

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

Change-Id: I21786071963cbd5c8dd44793808fba06784b3e98