Merge "Import a few android.net unit tests into frameworks-net" am: 24660e5bb7
am: 1ce75f643c

Change-Id: I9e2623e85bff3ca39738644a4b9d7abc216f52b8