Merge "Change the alignment of the foreground preferernce controller" into tm-dev

src/com/android/settings/nfc/NfcForegroundPreferenceController.java

@@ -93,7 +93,7 @@ public class NfcForegroundPreferenceController extends BasePreferenceController
             return;
         }
         final ListPreference listPreference = (ListPreference) preference;
-        listPreference.setIconSpaceReserved(true);
+        listPreference.setIconSpaceReserved(false);
         listPreference.setValue(mListValues[mPaymentBackend.isForegroundMode() ? 1 : 0]);
     }