Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission"