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

Change-Id: I450069925ec6b931d88c964aba4975167531d93d