aml_net_331610000 (9554781,com.google.android.captiveportallogin,com.google.android.networkstack)
Snap for 9021447 from 42ab85cd6b160e0139b2503fa7bee2b43c87727f to mainline-networking-release

Change-Id: I1b0e06b252415628844cbd8654c4af306b83ca05