Merge commit 'bc4da97ce0fcd0ddef228048bc663e383776c323' into mncvtdev-to-mmwirelessde...

diff --cc api/system-current.txt
index 1c1b2b0,3cceadc..29044a1
--- 1/api/system-current.txt
--- 2/api/system-current.txt
+++ b/api/system-current.txt
@@@ -32822,10 -32888,10 +32822,10 @@@ package android.telephony 
      method public android.os.PersistableBundle getConfig();
      method public android.os.PersistableBundle getConfigForSubId(int);
      method public static android.os.PersistableBundle getDefaultConfig();
 -    method public void reloadCarrierConfigForSubId(int);
 +    method public void notifyConfigChangedForSubId(int);
      method public void updateConfigForPhoneId(int, java.lang.String);
      field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";
-     final java.lang.String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls";
+     field public static final java.lang.String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls";
      field public static final java.lang.String BOOL_ALLOW_VIDEO_PAUSE = "bool_allow_video_pause";
      field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";
      field public static final java.lang.String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";