[automerger skipped] Merge "Add instrumentation to test NetworkAgent." into rvc-dev am: b0bf3e94fa -s ours
am skip reason: Change-Id Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5 with SHA-1 eea3b016ce is in history
Change-Id: I92c0c3da037eabed28f78c09ffad80074602dd5f
This commit is contained in: