The classes should not be picked up from frameworks/base, as they are part of several mainline modules. Bug: 151052811 Test: m; manual: flashed, wifi and telephony working Test: atest CtsNetTestCasesLatestSdk:CaptivePortalApiTest (clean cherry-pick from internal branch) Merged-In: Ic7534afe3a437f2089ed33cebdad391dc498d187 Change-Id: Ic7534afe3a437f2089ed33cebdad391dc498d187