resolved conflicts for merge of d833cb54 to mnc-vt-dev

Change-Id: Ibd74014f660e0e6c6bdab2a01a35a81733359b86

diff --cc telephony/java/android/telephony/CarrierConfigManager.java
index 653048a,62e532e..4b1eb1b
--- 1/telephony/java/android/telephony/CarrierConfigManager.java
--- 2/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@@ -405,29 -405,14 +405,38 @@@ public class CarrierConfigManager 
      public static final String KEY_MMS_USER_AGENT_STRING = "userAgent";
  
      /**
 +     * Flag indicating whether to allow carrier video calls to emergency numbers.
 +     * When {@code true}, video calls to emergency numbers will be allowed.  When {@code false},
 +     * video calls to emergency numbers will be initiated as audio-only calls instead.
 +     *
 +     * @hide
 +     */
 +    @SystemApi
 +    public static final String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS =
 +            "bool_allow_emergency_video_calls";
 +
 +    /**
 +     * Flag indicating whether the carrier supports video pause signaling.  When {@code true}, the
 +     * carrier supports use of the {@link android.telecom.VideoProfile#STATE_PAUSED} video state
 +     * to pause transmission of video when the In-Call app is sent to the background.
 +     * When {@code false}, video pause signaling is not supported.  {@code True} by default unless
 +     * a carrier configuration overrides the default.
 +     *
 +     * @hide
 +     */
 +    @SystemApi
 +    public static final String BOOL_ALLOW_VIDEO_PAUSE =
 +            "bool_allow_video_pause";
 +
++    /**
+      * Determines whether the carrier supports making non-emergency phone calls while the phone is
+      * in emergency callback mode.  Default value is {@code true}, meaning that non-emergency calls
+      * are allowed in emergency callback mode.
+      * @hide
+      */
+     public static final String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL =
+             "allowNonEmergencyCallsInEcm";
+ 
      /** The default value for every variable. */
      private final static PersistableBundle sDefaults;