[automerger skipped] Merge "Add instrumentation to test NetworkAgent." into rvc-dev am: 14fc421e23 -s ours am: 5970a995af -s ours am: f9377000a7 -s ours
am skip reason: Change-Id Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5 with SHA-1 2116068514 is in history
Change-Id: Ifb1fa26414b5c5b1f15b28e9d67b8ca3e4b69e2d
This commit is contained in: