Revert "MSIM: voice/sms subscription related API changes."

This reverts commit 1c40482ecf97e3a6d70f33bdfab74efc8e5ad1e9.

Conflicts:
	telephony/java/android/telephony/SubscriptionManager.java
	telephony/java/com/android/internal/telephony/ISub.aidl