Merge "add three new carrier configs for call forwarding, Caller ID and Call...
Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev am: 9ccabdbc
am: c49d3b2e
Change-Id: I9b5f09a5f42c099d048ea5ac0a98a644514a1067