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

Change-Id: Icbddddc52bfe2913b3c980d42f47cd885b5b3587