Merge "support vzw roaming default on" into pi-dev

am: 369d65b2e9

Change-Id: I056adbebe1efecb1a7d6f4fc09fbd94f1e4b52da

diff --cc packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
Simple merge

diff --cc packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CarrierActionUtils.java
Simple merge

diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge

diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge

diff --cc telephony/java/com/android/internal/telephony/ITelephony.aidl
Simple merge