Merge "Merge "Tcp socket metrics: implement INetdEventListener callback" am: 93b1787a am: 5ba62a21" into oc-mr1-dev-plus-aosp