Merge "[Settings] Avoid crash when adding new APN" am: 18bf77ee am: 3fd54b4e

                android:value="true" />

        </activity>

        <!-- Runs in the phone process since it needs access to UiccController -->

        <activity android:name="Settings$ApnSettingsActivity"

                android:label="@string/apn_settings"

                android:launchMode="singleTask"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:parentActivityName="Settings$NetworkDashboardActivity"

                android:process="com.android.phone">

                android:configChanges="orientation|keyboardHidden|screenSize">

            <intent-filter android:priority="1">

                <action android:name="android.settings.APN_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

        </activity>

        <activity android:name="Settings$IccLockSettingsActivity"

                android:label="@string/sim_lock_settings"

                android:process="com.android.phone">

                android:label="@string/sim_lock_settings">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />