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

Change-Id: I9ea46ce95161b5560cde7352d8a2464eb45f099d