Revert "Interface changes to support Multi SIM functionality."

This reverts commit 94bf19fa9b109f8401788b1e2fb712b20761052e.