Merge "Add @TestApi for the methods of VoiceInteractionSession.ActivityId"