[automerger skipped] Merge "Do not detect portals when DNS returns private...

[automerger skipped] Merge "Do not detect portals when DNS returns private IPs" into rvc-dev am: 6fb2a069 am: 414cb985 am: 40ce53cf am: cf015d1c -s ours am: d907c825 -s ours

am skip reason: Change-Id I51975e18f424e3b7265011000f073777f376e597 with SHA-1 75e9d901 is in history

Change-Id: I0942b9392226d1d133e60bc0ea5562ff1d46b868