Merge "Add instrumentation to test NetworkAgent." am: 40517308 am: 833b0bcb am: 46092d97 am: dfde6dea Change-Id: If27c46848e109fef65b172cc3f505e65d31a5202