tree d2ba66815871fc55273ef5996f6c899638bd2900
parent 640d4d5f43e17d66f4800a02d3e5706bb4a1ca8a
author Erik Kline <ek@google.com> 1524711880 +0900
committer Erik Kline <ek@google.com> 1524797503 +0900

Fix carrier app CaptivePortalLoginActivity probes to bypass Private DNS

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 64133961
Bug: 77140445
Bug: 78548486

Merged-In: Ibf958d9f4cba30e1900e209698fbe2ecccd5d7ac
Merged-In: Id8d1d882e056156c4b3dbf252fa1a231a4f87fdc
Change-Id: I48c60fd6711dcf5406fba62a3f88aea12183ff87
(cherry picked from commit 6a1707a0e7ccb52e012bb62f8c3aa76b8ffda52f)