aml_sta_341010020 (10692035,com.google.android.go.os.statsd,com.google.android.os.statsd)
Snap for 10615589 from 469520deb227d43ece62881ad12d2f8be192fc71 to mainline-os-statsd-release

Change-Id: I95021f0564d27255fa8c8dc5c9b1946c78fbcb48