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

Change-Id: I98e7a415cc34706accae57f2b78bd654fd4774ab