Merge "Make ActivityOptions#setLaunchTaskId a system API" into sc-v2-dev am: fdf0378b8d am: 8ea64535a8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16093509

Change-Id: I2a76d0ee05bc162bb171831aaf4691482756388d