Merge "Adjust Network's SocketFactory to restrict host name resolution to that Network" am: 34648fc64d

Original change: undetermined

Change-Id: I56c67c46b9b880f812ce10f11fc9871d02a1f6d9