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

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

Change-Id: If170f2b2f6ac7dd8a6ea1c732fb2a63dd025056f