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

Change-Id: I0122e93ae9748842db56706fdcaec03ff5c3880f