Revert "pulling changes from aospa-legacy"

Reverts VentureROM-Legacy/android_frameworks_opt_telephony-msim#1