Undid carrier constants as @SystemApis. Also had to move constants out of annotation.java because any references in that specific file need to be to public APIs. Bug: 148170690 Test: make, flash Change-Id: Ie4b827563dbc373c58ec805bc5400e0950b5b81e
5dd58dac7e
f2472fa7aa
051bd7f721
1413b254eb
dd2a5c7c69
6011b4e780