Merge "Add instrumentation to test NetworkAgent." am: 40517308f2

Change-Id: I799ad6fa5d6f1bf522414081bac75c952ad2baf7