Merge "Move telephony/cdma/ classes into appropriate package." am: 46c04b7bb8
am: 4a607da02b

Change-Id: I1516a6375c546f4af54984a4bff2ab2dcbc1783c