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

Change-Id: I7ad88b03e5c41cb8096316699158b4c7ae2c587e