[automerger skipped] Merge "Undo commit "Expose constants in Telephony.Carriers"" am: 774efe07 am: 2b082ce7 -s ours
am skip reason: Change-Id Ie4b827563dbc373c58ec805bc5400e0950b5b81e with SHA-1 5dbd3c3b is in history
Change-Id: Ica543e0bec0aa44850a7e0bcd3fe172955d781d6