Merge "Netd callbacks for socket calls in Bionic" am: 860ae7cd02

Change-Id: I97f2a1874fa47853489b22062cc7fd0617997f18