Merge "Also test for additional NetworkCallback calls"
am: dff6c5c30d

Change-Id: I00b3f7be06bde167872d0cdefe940cda5e138846
tree: 9eef88c04f25f1281c680f09f24412776232d458
  1. core/
  2. services/
  3. tests/