Merge "Fix not tracking splitting tasks correctly" into udc-dev am: 303d6101fb am: d7a75e5b9e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23149642

Change-Id: Id35db79cfa5597d8a3f190ac96dfc44ce51d06aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>