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

Change-Id: I6bfe2e30b4478991609a00c3d86bad3ebcbac955