Merge "Undo commit "Expose constants in Telephony.Carriers""