[automerger skipped] Merge "RELAND: NetworkRequest: Embed requestor uid & packageName" am: 3819be4271 -s ours
am skip reason: Change-Id I207c446108afdac7ee2c25e6bbcbc37c4e3f6529 with SHA-1 3e63df535a is in history

Change-Id: Ib90134e63ac00f6b377d27d1d8f2a125a247d724