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

Change-Id: I785964cf7e21c8caf4c7c2e0a74c5cab7ae15445