Merge "Missing back button on MultiSimSettings ActionBar" into cm-11.0

        <activity android:name="MultiSimSettings"

                android:label="@string/multi_sim_settings_title"

                android:process="com.android.phone"

                android:clearTaskOnLaunch="true">

                android:clearTaskOnLaunch="true"

                android:parentActivityName="Settings">

           <intent-filter>

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

                <action android:name="com.android.settings.MULTI_SIM_SETTINGS" />