[automerger skipped] Merge "RELAND: NetworkRequest: Embed requestor uid & packageName" am: 7fbddc35ba -s ours am: fe41d50efc am: 7a30367929

Change-Id: I499c41c4a635ed521094d45e817859298e6ee2c7
tree: ae839f62b674e1b07597ebc9ec0bbffd5f24d121
  1. core/
  2. services/
  3. tests/