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

Change-Id: Ifd1ddbaae50a54ef44e27f524300009eef9e1d8c