Merge "Add NetworkStack into AidToUidMapping"
am: a3dd0a5050

Change-Id: Ieea0a8b43c5e652ad00132b8b0a9bc9a0362f4e0