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

Change-Id: I810f30663bfe7be230b99da7d546a552c3ef078b
tree: 673a9f7cb442e783c888fab9ad3768a9d9877f50
  1. framework/
  2. OsuLogin/
  3. OWNERS