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