Revert "PhoneProxy: On v6 or greater RIL, when LTE_ON_CDMA is TRUE,"

This reverts commit 5343f09644650fae7708337eb55788f3d20aabb0.
PhoneProxy: Add a prop to enable always creating of CDMALTEPhone

Current Motorola OMAP4 devices need this in order to function properly
Will need to enable telephony.rilV7NeedsCDMALTEPhone prop on these devices

Change-Id: I22ef7688e422986d63a0cced1fb2e872c6e01c80
PhoneProxy: fix key.length > 31 characters

derp

Change-Id: Ib7d1030a68eedfcc782e9b2586a911e7c3df5cec
Merge remote-tracking branch 'refs/remotes/cm/cm-10.1' into jb-4.2

Signed-off-by: travp624 <travp624@gmail.com>