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

Change-Id: I4976be17b20e7ecc6466303179e53629f2252937