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

Change-Id: I499c41c4a635ed521094d45e817859298e6ee2c7