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

Change-Id: I346193114b57f7eb1e06cc3b013eff0ada806f5c