Merge "Undo commit "Expose constants in Telephony.Carriers"" am: 774efe07e9

Change-Id: Ifbe8ce193c55fea9298558f7df4b63ee654ce10b