[automerger skipped] Merge "RELAND: NetworkRequest: Embed requestor uid & packageName" am: 7fbddc35ba -s ours
am skip reason: Change-Id I207c446108afdac7ee2c25e6bbcbc37c4e3f6529 with SHA-1 31f7152793 is in history

Change-Id: Ib90134e63ac00f6b377d27d1d8f2a125a247d724
tree: 176dfe0a8dee4fe899b12bbfa94777abe4e974cb
  1. core/
  2. services/
  3. tests/