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

Change-Id: I5784b867346a280307966721cd47e562fffcbe17