Merge "Undo commit "Expose constants in Telephony.Carriers"" into rvc-dev