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

Change-Id: I28b36b7a7bb207dbe5241bf3da73cfc1ce2f5547