[automerger skipped] Merge "DO NOT MERGE: RELAND: NetworkRequest: Embed requestor uid & packageName" into stage-aosp-master am: be37378755 -s ours
am skip reason: Change-Id I207c446108afdac7ee2c25e6bbcbc37c4e3f6529 with SHA-1 e4f2b05266 is in history

Change-Id: Iac17ca3df5826eb235fbc7ef02c0a5de4f06f44e
tree: 9f44a12ca16a351dfd8ad7369c716ed92622f01f
  1. framework/
  2. OsuLogin/
  3. OWNERS