am 6b57033b: am 8b81a638: Merge "getProxy in ConnectivityService returns port w/PAC" into klp-dev am: 4c6caa5172

Original change: undetermined

Change-Id: Id52adef84915b37dac848701913b566d2768a5d3