resolved conflicts for merge of 5df4b5a7 to master

    <!-- Enables SIP on WIFI only -->

    <bool name="config_sip_wifi_only">false</bool>

    <!-- Boolean indicating if restoring network selection should be skipped -->

    <!-- The restoring is handled by modem if it is true-->

    <bool translatable="false" name="skip_restoring_network_selection">false</bool>

    <!-- Number of database connections opened and managed by framework layer

         to handle queries on each database. -->

    <integer name="db_connection_pool_size">1</integer>

                            EVENT_SIM_RECORDS_LOADED, null);

                    mNeedToRegForSimLoaded = false;

                }

                boolean skipRestoringSelection = phone.getContext().getResources().getBoolean(

                        com.android.internal.R.bool.skip_restoring_network_selection);

                if (!skipRestoringSelection) {

                    // restore the previous network selection.

                    phone.restoreSavedNetworkSelection(null);

                }

                pollState();

                // Signal strength polling stops when radio is off

                queueNextSignalStrengthPoll();