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

Change-Id: I7c55f30486e9b21ff793a8ad0fa2e1f3bcbf2498