Merge "Don't check MAINLINE_NETWORK_STACK permission for network stack"