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

Change-Id: I3dbe01259b1eda95431b4ebea0880b31836d56b4