Merge "Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev am: 7d2a0a05 am: 46d24970" into nyc-mr1-dev-plus-aosp