aml_net_331313030 (9393576,com.google.android.captiveportallogin)
Snap for 8570526 from 9eaf7c7d4eae3475ee4327cc2bb7fd4ec554e68d to mainline-networking-release

Change-Id: I0394fcfa59d4c18ecb38462435a61bdfc1caa0b6