am 2711ed3e: Merge "IMS: Handle SS during OOS scenarios" into mnc-dr-dev

* commit '2711ed3eb59f5158e6e2452df626662e4517e27e':
  IMS: Handle SS during OOS scenarios