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

Change-Id: Id4ef7671c62170c6a8236c122f0c5cff9382fb8b