Merge "[TelephonyMainline] @hide @SystemApi and revisit them in S. - CarrierColumns" into rvc-dev am: 3312226652

Change-Id: Ife2c5003152ecb3cbcc169967176c6392cccd57f