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

Change-Id: I72087d4afe6399275c8ff60de2231a970efdc7ad