Merge "Adjust Network's SocketFactory to restrict host name resolution to that Network" am: 1ff0fad207

Original change: undetermined

Change-Id: I7ad39ac1b230b3b19f7cfc3a9e192d59acdf7c53