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

Change-Id: Ifa1bb230e4f3ffbe21bdf608e19805bdd40af23a