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

Change-Id: I1474e70e6100efdcc1577a36df935a60f87b9262