[automerger skipped] Merge "NetworkRequest: Embed requestor uid & packageName" am: 9dd718c5d9 am: 894c9db9f5 am: 050d6c11d5 -s ours
am skip reason: Change-Id I207c446108afdac7ee2c25e6bbcbc37c4e3f6529 with SHA-1 e38acab53e is in history

Change-Id: Ie84d552bda61e5f3e5e1000eb6496a5d5da165b2