Merge "Undo commit "Expose constants in Telephony.Carriers"" into rvc-dev am: f414c083 am: 5d93bbac Change-Id: I4d7171d7bb8a9ed7ec5a5107f83740924b1b3a07