aml_sta_340912000 (10798765,com.google.android.os.statsd)
Snap for 10453563 from d608568a4d220cc73ce87193ba5b6b7afd22bbdb to mainline-os-statsd-release

Change-Id: I830b9ae3addfd6cb132544bfabeae6d8002e9d44