Merge "Move more core networking tests to framework/base/tests/net." am: d6c3813c08
am: 8f852c341f

Change-Id: Iab87e7ce5b62a1ff21c7aee5d0f25597713f6c65