Merge "Remove telephony-common classes." am: 6d77176920 am: bfed6db4e1
am: 76ff86d56a

Change-Id: I43a4022c8c6f723098643faaa21e4b3f63ebf96c