[automerger skipped] Merge "Add instrumentation to test NetworkAgent." into...
[automerger skipped] Merge "Add instrumentation to test NetworkAgent." into rvc-dev am: b0bf3e94 -s ours am: 30f74645 -s ours
am skip reason: Change-Id Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5 with SHA-1 eea3b016 is in history
Change-Id: If6ce5315f3666418eb808303ff85d9e87a1246f1