Merge "Revert "NetworkRequest: Embed requestor uid & packageName"" am: 617b4b00e3

Change-Id: I00dd341f699d2a22cc3d190b43314a49bee9062a