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

Change-Id: Icec97c6d2806a40cc7f7e1801ab9f4a84a6674e1