am 4477d6aa: Merge "Adjust Network\'s SocketFactory to restrict host name resolution to that Network" into lmp-preview-dev am: d4fbd78bb0

Original change: undetermined

Change-Id: I7d507fbe7a9af17c7127e85adc65d3b34a104ac4