Merge "Add instrumentation to test NetworkAgent." am: 1afe9973c1

Change-Id: I799ad6fa5d6f1bf522414081bac75c952ad2baf7
tree: 9c33d006b3968f6e590232fab276ffe63950d7c5
  1. core/
  2. services/
  3. tests/