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

Change-Id: Ib93ef0ac42a5a67acb5e9ca6d85b4fd6ba065f8c