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

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

Change-Id: I030b9d68699e949471078218856e1e1b25961179