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