Merge "Handle NOT_SUPPORTED modem response as not supporting secondary carrier." am: 98926fdf22

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1741536

Change-Id: Ida51e850311261e27af2451089b9a12fb377e127