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

Original change: undetermined

Change-Id: I0a79c338e049148678367f56b3a7f55c6541d270