Merge "Make ActivityOptions#setLaunchTaskId a system API" into sc-v2-dev