[automerger skipped] Merge "Revert "NetworkRequest: Embed requestor uid & packageName"" am: 32e18bea08 am: e04b0f689b am: b04621eb3c -s ours
am skip reason: skipped by user rpius

Change-Id: I32f14eb9d9157a2e139b239d091c80b710b29e57
tree: 34666c2e741162828356510cf99d004660c0a29c
  1. core/
  2. services/
  3. tests/