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

Change-Id: I8c03db23b28eb231f352b578ca3faa33d519aed8