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

Change-Id: I3ff19e475d7fb013067025a567e4517b64558d33