aml_net_331110020 (9161990,com.google.android.captiveportallogin/com.google.android.networkstack)
Snap for 8570526 from a7af87e5bf47a1b3ae2945c09f466d476d89a229 to mainline-networking-release

Change-Id: If844a1dcbec3980813ec78eb821a0de5c9bb4f36