aml_net_331110020 (9161990,com.google.android.captiveportallogin/com.google.android.networkstack)
Snap for 8570526 from 2959cec403098292e35b4b7acb86b61d1af50620 to mainline-networking-release

Change-Id: I4b1e24ffc527a240438a9d30573257bab8c77313