Merge "Add instrumentation to test NetworkAgent." am: 40517308f2 am: 833b0bcbf5 am: 46092d9775

Change-Id: I2fee5c4a0d104931095b355d96513e016ef953a4