Merge 01572fc67674946574ce6817e20729889367356c on remote branch

Change-Id: I8b5415b92561608551e8db1af17a14df7d3b500e
diff --git a/src/com/android/mms/ui/ComposeMessageActivity.java b/src/com/android/mms/ui/ComposeMessageActivity.java
index 3cdc997..32d9116 100644
--- a/src/com/android/mms/ui/ComposeMessageActivity.java
+++ b/src/com/android/mms/ui/ComposeMessageActivity.java
@@ -5611,7 +5611,7 @@
         if (bCheckEcmMode) {
             // TODO: expose this in telephony layer for SDK build
             boolean inEcm = TelephonyProperties.in_ecm_mode().orElse(false);
-            boolean inScm = SystemProperties.getBoolean("ril.cdma.inscmmode", false);
+            boolean inScm = SystemProperties.getBoolean("ril.inscbm", false);
             Log.d(TAG,"ecm mode: " + inEcm);
             Log.d(TAG,"scm mode: " + inScm);
             if ((inEcm || inScm) && !isEmergencySmsSupport()) {