Merge "Move ACTION_CARRIER_* intent and extras from TelephonyIntents to TelephonyManager."