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

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

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