Merge "Add NetworkStack into AidToUidMapping"