[automerger skipped] Merge "Undo commit "Expose constants in...

[automerger skipped] Merge "Undo commit "Expose constants in Telephony.Carriers"" am: 774efe07 am: 2b082ce7 -s ours am: 98913bf1 -s ours am: e96bb49e -s ours

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

Change-Id: If170f2b2f6ac7dd8a6ea1c732fb2a63dd025056f