[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 31f7152793 is in history

Change-Id: Iac17ca3df5826eb235fbc7ef02c0a5de4f06f44e
tree: 276bbfde826876e5e32b69cbae6a34a5f1143a8d
  1. core/
  2. services/
  3. tests/