Merge "SubscriptionManager: Fix NPE in getSimStateForSlotIdx" into mnc-dev