aml_sta_341010020 (10692035,com.google.android.go.os.statsd,com.google.android.os.statsd)
Snap for 10453563 from 6a05a6fd9c9e46dd403e791d1405a2607b2c71fe to mainline-os-statsd-release

Change-Id: Ibfbad349d158cb3f09ae4950729940930c909450