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

Change-Id: I9b5f09a5f42c099d048ea5ac0a98a644514a1067