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

Change-Id: I0481efa08b81d79d387c446b6c97395501ed2336