Merge "Tcp socket metrics: implement INetdEventListener callback"
am: 93b1787a3d

Change-Id: Ife421f2612b0bfc2d6be5c6d174d24abd4d2e2fb