Merge "Adjust Telephony code to use Telecom constants" am: 551633e3ec

Change-Id: Id51f1bde8fdb6a11d595c698fe515d61da8423d8