Merge "Annotate Data and Voice Roaming setters with @TestApi."