Merge "[TelephonyMainline] @hide @SystemApi and revisit them in S. -...
Merge "[TelephonyMainline] @hide @SystemApi and revisit them in S. - CarrierColumns" into rvc-dev am: 33122266 am: 49dee84f am: dd7d2087 am: 9bf902af am: fe68aa50
Change-Id: Ibf6189d17d14ffdca3c56c1ae709098f33e980b9