Merge "NetworkRequest: Embed requestor uid & packageName" am: 9dd718c5d9

Change-Id: Ic4f9247e18a9d1cc22b26500b47da1af2d9b011d