Merge "Import a few android.net unit tests into frameworks-net"