[automerger skipped] Merge "Do not detect portals when DNS returns private IPs" into rvc-dev am: 6fb2a069f9 am: 414cb985f6 am: 40ce53cff5 -s ours

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/10995185

Change-Id: Ieb0c1f6ddfeacb7431b060f0404447f93b34611f