Merge "Remove a redundant check in statsd socket code."
am: e6a644bc35

Change-Id: I3357328295ae6e3488a7beaffd725a5ca9c33999