[automerger skipped] Merge "DO NOT MERGE: RELAND: NetworkRequest: Embed requestor uid & packageName" into stage-aosp-master am: be37378755 -s ours am: e6637e4c74 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifdd6d655de499c5e64f59e7ae0ca9ae2fad62e62
tree: 6fbd76f74763ab3de587adc52c1e7225ff99292d
  1. core/
  2. services/
  3. tests/