Update multi-launch tests to support watch. am: 7b79276301
am: b18a34be19

Change-Id: Id90d75b9a9e58c84c3ffc9ecca0bfdad527f6fb2