Merge "Add tests to services/tests/net test mapping" am: 85e73e6099

Change-Id: Id503a2daac1a508095b388aa8524342141571d6e