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