Merge "app link handling under restricted mobile data" into oc-dr1-dev

data/etc/framework-sysconfig.xml

packages/CarrierDefaultApp/AndroidManifest.xml

...android/carrierdefaultapp/CaptivePortalLoginActivity.java

...src/com/android/carrierdefaultapp/CarrierActionUtils.java

...src/com/android/carrierdefaultapp/CustomConfigLoader.java

telephony/java/android/telephony/CarrierConfigManager.java

telephony/java/android/telephony/TelephonyManager.java

...phony/java/com/android/internal/telephony/ITelephony.aidl

...java/com/android/internal/telephony/TelephonyIntents.java