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

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

Change-Id: I86fcbd7070fec49bd1f123d4b668fe6df74a914f