Merge "Add a test API for testing NetworkStack.getService" am: d4373f3a54

Change-Id: I359470501a3a4b0ded7c806e6a661867c2d1a294