Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev