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

Change-Id: Iba01930bc02239e54bd05ef4e98a99cdb74d4be4