aml_net_331610000 (9554781,com.google.android.captiveportallogin,com.google.android.networkstack)
Snap for 9229821 from c280bb82aff666b142b3701a7fa63a2d4f4d6958 to mainline-networking-release

Change-Id: Ib929137783c627ec1ae1292483ac3f281946c200