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

Change-Id: Ia63bae0a33c40247d16549b35b092dab44668b4a