[automerger skipped] Merge "Add test for NetworkRequest#getRequestorUid()" into rvc-dev am: 1abfb9dcc0 am: 3f82dcaf63 -s ours am: 089a87ddf1 -s ours
am skip reason: Change-Id I9602cac142b3e45d12e66a6f3f35ab594e6590c1 with SHA-1 bbc5554392 is in history
Change-Id: I50a18a772954e5e4b107bf39ae194f7a587411d8
This commit is contained in: