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

Change-Id: If27c46848e109fef65b172cc3f505e65d31a5202