Merge "Remove unused code-paths in Telephony." am: 6f1fe13d80 am: 44200fcbe3
am: 49d5ca7a0f

Change-Id: I870e8599710110fea9fab1dde363f0076e58ae3a