Revert "fix conflicts"

This reverts commit b938bb1605b6eda3d9366965139063cd3e0ddb54.
Revert "Telephony(MSIM): Add StatusBar support for MultiSim."

This reverts commit e35fe4a97930e55fd058d6fe6e2b38891a09ba32.
Revert "Telephony(MSIM): MultiSim support for PIN/PUK & Operator Name."

This reverts commit bb8eadd2bf439a24259a8ef9b86d10028a5b6401.
Revert "Telephony(MSIM): Add support for MultiSim"

This reverts commit b7e0905f5c6bc6de145599c9e59510abea3c1e82.
Revert "Telephony: STK CC feature implementation"

This reverts commit 68e65e55f541f4727923bfbd09a0cd29c9809cee.
Revert "Fix for data and roaming icons"

This reverts commit f5fc5a564349335ff2947113b2e550dab69ddde9.
Revert "Update markings for the OMH changes"

This reverts commit ca46805a96be9fe37d9170ae787ceedf579f5dde.
Revert "Property constants to support OMH"

This reverts commit 5f764d216e30af582752acfa352a9e7d83ad0f13.
Revert "    CSVT: Introduce Circuit-Switch Video Telephony."

This reverts commit 3d3f9dfc6339d88dfdc96ab922833b1f5fb9b63e.
Revert "Telephony: Add data rat constant"

This reverts commit 1c471c825bc4e28f93f679ab404f99dbb84e3bd8.
Revert "telephony: IMS changes for VoLTE and VT"

This reverts commit 93b75a708930ee194b673cb68bab5e32cc52d52f.
Revert "Telephony: Add TD-SCDMA network modes"

This reverts commit 11c056e2443fff77e8e2e9d14b32400017df8390.
Revert "Telephony: SMS over IMS"

This reverts commit 05e8fe899f233940587a05168d4f4f867be81449.
Revert "Telephony: Add new apn.sim.operator_numeric property"

This reverts commit ef445477e98c6935e865ba1fe4c696220adf576b.
Revert "Telephony: Add functionality to handle ICC IO error"

This reverts commit 8c506237c7800ef5540379308ecae6bd276a7000.
Revert "Telephony: Initialize GsmCellLocation class members properly"

This reverts commit ebfc309b3382e193d5b365057ecc4d8a082ffe12.
Revert "Telephony: Add Managed Roaming Intent."

This reverts commit be1839c1dc6dfd543ce6781e67000ce015efcca7.
Revert "Telephony: Add support for NETWORK_TYPE_GSM"

This reverts commit 53e29054521a0c03bfe707802677c667f70e2fd2.