Merge "Add a test API for testing NetworkStack.getService"