Merge "[TelephonyMainline] @hide @SystemApi and revisit them in S. - CarrierColumns"