Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" am: cfcbda3345 am: 9144bdf0e1
am: c1af699968

Change-Id: Ib70fe6fad107f3e9dce9ce673188c5ce5dc1ad7b