Merge "Move NetworkStack AIDLs to NetworkStack folder" am: 1c3acc8f8a am: 7569988e6f
am: 94b247370a

Change-Id: If9f501239974bd4bc40f0e923fc0b6153088a1f2