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

Change-Id: Id503a2daac1a508095b388aa8524342141571d6e