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

Change-Id: Iaa0ed65299946acec2d984bbe8b7b763ee2b52bf