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

Change-Id: I4f34f8c2dbedda1d23609e4eb8dc454b12729740