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
Change-Id: I0752e01422e43f840c60bd78c2e3735608bbd52f