Merge "Add NetworkStack into AidToUidMapping" am: a3dd0a5050
am: b64b24d127

Change-Id: I7275fb5693463680ff9e07ad15e81e90214c196b