Merge "Ignore orientation change to preserve ApnEditor." into nyc-mr2-dev

                android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />

        <activity android:name="Settings$ApnEditorActivity"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:label="@string/apn_edit">

            <intent-filter>

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