Merge "Hide blocking pay phone option use carrier config" am: c365007e5f am: 694020234b

am: cfae2075c6

Change-Id: Ia1ac8442a6d8a437d99b9e58b3228408a23b9dea

diff --cc telephony/java/android/telephony/CarrierConfigManager.java
index 0a9b904,1677533..fffa935
--- 1/telephony/java/android/telephony/CarrierConfigManager.java
--- 2/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@@ -3024,11 -2838,11 +3032,12 @@@ public class CarrierConfigManager 
          sDefaults.putBoolean(KEY_NOTIFY_VT_HANDOVER_TO_WIFI_FAILURE_BOOL, false);
          sDefaults.putStringArray(KEY_FILTERED_CNAP_NAMES_STRING_ARRAY, null);
          sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false);
+         sDefaults.putBoolean(KEY_SHOW_BLOCKING_PAY_PHONE_OPTION_BOOL, false);
          sDefaults.putBoolean(KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL, false);
          sDefaults.putBoolean(KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL, false);
 -        sDefaults.putBoolean(KEY_PERSIST_LPP_MODE_BOOL, true);
 +        sDefaults.putBoolean(KEY_ALLOW_METERED_NETWORK_FOR_CERT_DOWNLOAD_BOOL, false);
          sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null);
 +        sDefaults.putInt(KEY_IMSI_ENCODING_METHOD_INT, 2045);
          sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1);
          sDefaults.putInt(KEY_EMERGENCY_NOTIFICATION_DELAY_INT, -1);
          sDefaults.putBoolean(KEY_ALLOW_USSD_REQUESTS_VIA_TELEPHONY_MANAGER_BOOL, true);