[automerger skipped] Merge "Revert "NetworkRequest: Embed requestor uid & packageName"" am: 617b4b00e3 am: 438129f4aa am: b4a6263610 -s ours
am skip reason: skipped by user rpius

Change-Id: I32f14eb9d9157a2e139b239d091c80b710b29e57