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

Change-Id: I7f11346be248bd325f14d7039f5a5d5b2f45617a