[automerger skipped] Merge "RELAND: NetworkRequest: Embed requestor uid & packageName" am: 3819be4271 -s ours am: f66d933b13

Change-Id: I810f30663bfe7be230b99da7d546a552c3ef078b