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