Merge "Revert "Add configuration for network capabilities that would be..."" into main

    <bool name="config_enable_cellular_on_boot_default">true</bool>

    <bool name="config_enable_cellular_on_boot_default">true</bool>

    <java-symbol type="bool" name="config_enable_cellular_on_boot_default" />

    <java-symbol type="bool" name="config_enable_cellular_on_boot_default" />

    <!-- The network capabilities that would be forced marked as cellular transport regardless it's

         on cellular or satellite-->

    <string-array name="config_force_cellular_transport_capabilities">

        <!-- Added the following three capabilities for now. For the long term solution, the client

             requests satellite network should really include TRANSPORT_SATELLITE in the network

             request. With the following workaround, the clients can continue request network with

             the following capabilities with TRANSPORT_CELLULAR. The network with one of the

             following capabilities would also be marked as cellular. -->

        <item>ims</item>

        <item>eims</item>

        <item>xcap</item>

    </string-array>

    <java-symbol type="array" name="config_force_cellular_transport_capabilities" />

</resources>

</resources>