resolve merge conflicts of 9ac842a753 to nyc-mr2-dev-plus-aosp

Test: built
Change-Id: I156db22c13da98bce0077b2acb8d9f1a3d2ce406

src/com/android/settings/RadioInfo.java

@@ -1171,7 +1171,7 @@ public class RadioInfo extends Activity {
 
     void setImsConfigProvisionedState(int configItem, boolean state) {
         if (phone != null && mImsManager != null) {
-            QueuedWork.queue(new Runnable() {
+            QueuedWork.singleThreadExecutor().submit(new Runnable() {
                 public void run() {
                     try {
                         mImsManager.getConfigInterface().setProvisionedValue(
@@ -1181,7 +1181,7 @@ public class RadioInfo extends Activity {
                         Log.e(TAG, "setImsConfigProvisioned() exception:", e);
                     }
                 }
-            }, false);
+            });
         }
     }