Merge "Changing getSimState to use slot idx instead of sub id." into mnc-dev