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

Change-Id: I1eb98a82426d7b7e085316f8a67cdd1e81912538