Merge "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex to TelephonyManager""