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

* commit '3fa285f93e2810cbd31a71490b364be2b6636d9d':
  SubscriptionManager: Fix NPE in getSimStateForSlotIdx