aml_net_331313030 (9393576,com.google.android.captiveportallogin)
Snap for 8570526 from 018c12887827c60b005b79ac39f26fb707c37cc5 to mainline-networking-release

Change-Id: I90cd926630513b259f495ae9770bcd3807ab5964