Merge "Merge "Tcp socket metrics: implement INetdEventListener callback" am: 93b1787a3d am: 5ba62a2194" into oc-mr1-dev-plus-aosp
am: 0bde9c4355

Change-Id: Id17724faabe77fb7eaad7d3a7e009fb57f0d23d0