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

Change-Id: I7517b64e87b43acff501afc858c8fad433d0ecfc