[automerger skipped] Merge "Undo commit "Expose constants in Telephony.Carriers"" am: 774efe07e9 am: 2b082ce78f -s ours am: 98913bf11d -s ours

am skip reason: Change-Id Ie4b827563dbc373c58ec805bc5400e0950b5b81e with SHA-1 5dbd3c3b69 is in history

Change-Id: I0f51883988ccd49c6ffb11195bf6b9dbac01120f