aml_sta_331311000 (9264397,com.google.android.os.statsd)
Snap for 8564071 from 300225f3e9561e02d6abe8050fb341ee8b4891a3 to mainline-os-statsd-release

Change-Id: I5d575e90b5059e92a0d643507d41433c4daf5c59