Merge "Revert "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex t...""