Merge "Merge "Update multi-launch tests to support watch." into nyc-mr1-dev am: a0e8848796 am: 792bc281e5 am: a9cb72bc33" into nyc-mr2-dev-plus-aosp