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

Change-Id: Ieb4f53c24371e15ffb8a4d3797cd017ce90a12f5