Merge "Fix issue with provided options not being applied when launching split tasks" into sc-v2-dev am: b5c5258a65 am: 969bf4f9c9

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

Change-Id: I98da00a4edeb403a77acdba359f015ac97a8e07c