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

Change-Id: Ief4f6bd95ba513e08c5d2e9e8fef9d0c426b4478