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

Change-Id: I87f862892449e2598ce4b13106fa7cf8ad857ec6