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