aml_net_331610000 (9554781,com.google.android.captiveportallogin,com.google.android.networkstack)
Snap for 8570526 from 15fdf31c61251f3e5aa3b188df2770eb153b9484 to mainline-networking-release

Change-Id: I1d4eef8b0a88a03bf808ba569da13015ffb5af19