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

Change-Id: Iaa89732befa47116218ae7f6d11e33b367daa38f