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

Change-Id: I3ede060d3e8afca1bdba60e84c50a5464ffefe74