Messaging: Remove compatibility for old android versions

Change-Id: Id9065d60525a509271a0e64c0e349e857cb998e2

src/com/android/messaging/sms/BugleCarrierConfigValuesLoader.java

@@ -27,7 +27,6 @@ import android.util.SparseArray;
 
 import com.android.messaging.R;
 import com.android.messaging.util.LogUtil;
-import com.android.messaging.util.OsUtil;
 import com.android.messaging.util.PhoneUtils;
 
 /**
@@ -93,12 +92,9 @@ public class BugleCarrierConfigValuesLoader implements CarrierConfigValuesLoader
     private String loadLocked(final int subId, final Bundle values) {
         // Load from resources in earlier platform
         loadFromResources(subId, values);
-        if (OsUtil.isAtLeastL()) {
-            // Load from system to override if system API exists
-            loadFromSystem(subId, values);
-            return "resources+system";
-        }
-        return "resources";
+        // Load from system to override if system API exists
+        loadFromSystem(subId, values);
+        return "resources+system";
     }
 
     /**
@@ -158,9 +154,6 @@ public class BugleCarrierConfigValuesLoader implements CarrierConfigValuesLoader
      * @return the sub-dependent Context
      */
     private static Context getSubDepContext(final Context context, final int subId) {
-        if (!OsUtil.isAtLeastL_MR1()) {
-            return context;
-        }
         final int[] mccMnc = PhoneUtils.get(subId).getMccMnc();
         final int mcc = mccMnc[0];
         final int mnc = mccMnc[1];