Merge "Reset statsd writer to init state after close" am: 379bd47301
am: 3462059598

Change-Id: I72a9c5151cfc5e3679d6f3db3c5d43dab509d86a