Merge "Handle NOT_SUPPORTED modem response as not supporting secondary carrier." into sc-dev