Merge "Gate CDMA Supplementary Services on a CarrierConfig item" into sc-dev am: c3e6fc7a05

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305873

Change-Id: I2e266f0461e522558f637f5604eebaa3104f8182