aml_net_331313030 (9393576,com.google.android.captiveportallogin)
Snap for 9229821 from 6ef5a36e9d8c30eacc59ab6e1ea3c82d7c1e05e8 to mainline-networking-release

Change-Id: I275cc057f0b605464323fb12ae36d2fb8da18acf