Merge "Give owneship of packages/NetworkStack to Android Core Networking" am: f100fa13ea
am: 8976c53801

Change-Id: I9c1ed3d0a1474df2d4b9db24bec21695c6f3cdba