Merge "Do not mark in-process NetworkStack as persistent"

    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />

    <!-- Signature permission defined in NetworkStackStub -->

    <uses-permission android:name="android.permission.MAINLINE_NETWORK_STACK" />

    <application android:extractNativeLibs="false">

    <application

        android:extractNativeLibs="false"

        android:persistent="true">

        <service android:name="com.android.server.NetworkStackService">

            <intent-filter>

                <action android:name="android.net.INetworkStackConnector"/>