[automerger skipped] Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting."
am: ee570a61de  -s ours

Change-Id: I6fe186dc58a042378279ccc6d5c58f93f12790aa