Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev